From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 25 May 2012 07:22:04 +0000 (-0700)
Subject: return NULL on error
X-Git-Tag: v3.3.0a4~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6a7a1accfa07c4b2666796c88392c1b1a078bee;p=python

return NULL on error
---

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index c33ab8bc97..5ff39bb75b 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -381,11 +381,12 @@ zipimporter_find_module(PyObject *obj, PyObject *args)
         return NULL;
 
     switch (find_loader(self, fullname, &namespace_portion)) {
+    case fl_error:
+        return NULL;
     case fl_ns_found:
         /* A namespace portion is not allowed via find_module, so return None. */
         Py_DECREF(namespace_portion);
         /* FALL THROUGH */
-    case fl_error:
     case fl_not_found:
         result = Py_None;
         break;
@@ -393,7 +394,7 @@ zipimporter_find_module(PyObject *obj, PyObject *args)
         result = (PyObject *)self;
         break;
     }
-    Py_XINCREF(result);
+    Py_INCREF(result);
     return result;
 }