commit 8905fcc85a6fc3ac394bc89b0bbf40897e9497a6
author Serhiy Storchaka <storchaka@gmail.com> Tue Dec 11 08:38:03 2018 +0200
committer GitHub <noreply@github.com> Tue Dec 11 08:38:03 2018 +0200
tree 5b7afcdceab6dae37e3db90f952c5c76fe46b5cf
parent bb86bf4c4eaa30b1f5192dab9f389ce0bb61114d

bpo-35454: Fix miscellaneous minor issues in error handling. (#11077)

* bpo-35454: Fix miscellaneous minor issues in error handling.

* Fix a null pointer dereference.

Python/import.c

diff --git a/Python/import.c b/Python/import.c
index 15637c6..c4f0877 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2143,10 +2143,10 @@
     }
 
     mod = _PyImport_FindExtensionObject(name, path);
-    if (mod != NULL) {
+    if (mod != NULL || PyErr_Occurred()) {
         Py_DECREF(name);
         Py_DECREF(path);
-        Py_INCREF(mod);
+        Py_XINCREF(mod);
         return mod;
     }