From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 6 May 2012 15:15:23 +0000 (+0200)
Subject: Fix too early decrefs.
X-Git-Tag: v3.3.0a4~252
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b78174c01071d4166a8f5dff47f5c46563dfd3d4;p=python

Fix too early decrefs.
---

diff --git a/Python/import.c b/Python/import.c
index ccba1066d2..fd42a892a1 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1639,7 +1639,6 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
 
             if (level == 0) {
                 final_mod = PyDict_GetItem(interp->modules, front);
-                Py_DECREF(front);
                 if (final_mod == NULL) {
                     PyErr_Format(PyExc_KeyError,
                                  "%R not in sys.modules as expected", front);
@@ -1647,6 +1646,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
                 else {
                     Py_INCREF(final_mod);
                 }
+                Py_DECREF(front);
             }
             else {
                 Py_ssize_t cut_off = PyUnicode_GET_LENGTH(name) -
@@ -1660,7 +1660,6 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
                 }
 
                 final_mod = PyDict_GetItem(interp->modules, to_return);
-                Py_DECREF(to_return);
                 if (final_mod == NULL) {
                     PyErr_Format(PyExc_KeyError,
                                  "%R not in sys.modules as expected",
@@ -1669,6 +1668,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
                 else {
                     Py_INCREF(final_mod);
                 }
+                Py_DECREF(to_return);
             }
         }
         else {