From 027b09c5a13aac9e14a3b43bb385298d549c3833 Mon Sep 17 00:00:00 2001 From: Stefan Krah Date: Mon, 25 Mar 2019 21:50:58 +0100 Subject: bpo-36370: Check for PyErr_Occurred() after PyImport_GetModule() (GH-12504) --- Python/sysmodule.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Python/sysmodule.c') diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 4351a7fb37..3df4d44a7c 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -283,7 +283,9 @@ sys_displayhook(PyObject *module, PyObject *o) builtins = _PyImport_GetModuleId(&PyId_builtins); if (builtins == NULL) { - PyErr_SetString(PyExc_RuntimeError, "lost builtins module"); + if (!PyErr_Occurred()) { + PyErr_SetString(PyExc_RuntimeError, "lost builtins module"); + } return NULL; } Py_DECREF(builtins); -- cgit v1.2.1