Issue #25698: Prevent possible replacing imported module with the empty one

if the stack is too deep.

Issue #25698: Prevent possible replacing imported module with the empty one
if the stack is too deep.
48a583b1 · Serhiy Storchaka · c04fb56e · 48a583b1
Commit 48a583b1 authored Feb 10, 2016 by Serhiy Storchaka
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Python/import.c Python/import.c +6 -2

No files found.
--- a/Python/import.c
+++ b/Python/import.c
@@ -671,9 +671,13 @@ PyImport_AddModuleObject(PyObject *name)
    PyObject *modules = PyImport_GetModuleDict();
    PyObject *m;
-    if ((m = PyDict_GetItem(modules, name)) != NULL &&
+    if ((m = PyDict_GetItemWithError(modules, name)) != NULL &&
-        PyModule_Check(m))
+        PyModule_Check(m)) {
        return m;
+    }
+    if (PyErr_Occurred()) {
+        return NULL;
+    }
    m = PyModule_NewObject(name);
    if (m == NULL)
        return NULL;