From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 15 Jun 2017 17:54:38 +0000 (+0300)
Subject: bpo-30626: Fix error handling in PyImport_Import(). (#2103)
X-Git-Tag: v3.7.0a1~583
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=145541c;p=thirdparty%2FPython%2Fcpython.git

bpo-30626: Fix error handling in PyImport_Import(). (#2103)

In rare circumstances PyImport_Import() could return NULL without raising
an error.
---

diff --git a/Python/import.c b/Python/import.c
index 9a78d6adc7a2..d8a207b4b369 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1784,9 +1784,13 @@ PyImport_Import(PyObject *module_name)
     Py_DECREF(r);
 
     modules = PyImport_GetModuleDict();
-    r = PyDict_GetItem(modules, module_name);
-    if (r != NULL)
+    r = PyDict_GetItemWithError(modules, module_name);
+    if (r != NULL) {
         Py_INCREF(r);
+    }
+    else if (!PyErr_Occurred()) {
+        PyErr_SetObject(PyExc_KeyError, module_name);
+    }
 
   err:
     Py_XDECREF(globals);