Issue #19437: Fix init_builtin(), handle _PyImport_FindExtensionObject()

failure

Issue #19437: Fix init_builtin(), handle _PyImport_FindExtensionObject()
failure
5eb4f59c · Victor Stinner · 46ef3195 · 5eb4f59c
Commit 5eb4f59c authored Nov 14, 2013 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Python/import.c Python/import.c +5 -1

No files found.
--- a/Python/import.c
+++ b/Python/import.c
@@ -948,8 +948,12 @@ static int
 init_builtin(PyObject *name)
 {
    struct _inittab *p;
+    PyObject *mod;

-    if (_PyImport_FindExtensionObject(name, name) != NULL)
+    mod = _PyImport_FindExtensionObject(name, name);
+    if (PyErr_Occurred())
+        return -1;
+    if (mod != NULL)
        return 1;

    for (p = PyImport_Inittab; p->name != NULL; p++) {