]> granicus.if.org Git - python/commitdiff
Issue #19437: Fix init_builtin(), handle _PyImport_FindExtensionObject()
authorVictor Stinner <victor.stinner@gmail.com>
Thu, 14 Nov 2013 21:38:52 +0000 (22:38 +0100)
committerVictor Stinner <victor.stinner@gmail.com>
Thu, 14 Nov 2013 21:38:52 +0000 (22:38 +0100)
failure

Python/import.c

index ad181a2942a3b94bb169584c9ea6d111749befda..f0ac0515a041890d33a7d0df7cb010633c82fe50 100644 (file)
@@ -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++) {