traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[3.6] bpo-30626: Fix error handling in PyImport_Import(). (GH-2103) (#2221) 

In rare circumstances PyImport_Import() could return NULL without raising
an error.
(cherry picked from commit 145541c)
This commit is contained in:
Serhiy Storchaka 2017-06-15 21:15:11 +03:00 committed by GitHub
parent e45ea377b8
commit fab05de214
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

@ -1785,9 +1785,13 @@ PyImport_Import(PyObject *module_name)
Py_DECREF(r); Py_DECREF(r);
modules = PyImport_GetModuleDict(); modules = PyImport_GetModuleDict();
r = PyDict_GetItem(modules, module_name); r = PyDict_GetItemWithError(modules, module_name);
if (r != NULL) if (r != NULL) {
Py_INCREF(r); Py_INCREF(r);
}
else if (!PyErr_Occurred()) {
PyErr_SetObject(PyExc_KeyError, module_name);
}
err: err:
Py_XDECREF(globals); Py_XDECREF(globals);