Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

if the stack is too deep.
This commit is contained in:
Serhiy Storchaka 2016-02-10 10:31:43 +02:00
parent 288ed038aa 48a583b1d8
commit 5b613dd810
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Python/import.c
View File

@ -671,9 +671,13 @@ PyImport_AddModuleObject(PyObject *name)
PyObject *modules = PyImport_GetModuleDict(); PyObject *modules = PyImport_GetModuleDict();
PyObject *m; PyObject *m;
if ((m = PyDict_GetItem(modules, name)) != NULL && if ((m = PyDict_GetItemWithError(modules, name)) != NULL &&
PyModule_Check(m)) PyModule_Check(m)) {
return m; return m;
}
if (PyErr_Occurred()) {
return NULL;
}
m = PyModule_NewObject(name); m = PyModule_NewObject(name);
if (m == NULL) if (m == NULL)
return NULL; return NULL;