Fix too early decrefs.

pitrou · pitrou · commit b78174c01071 · 2012-05-06T17:15:23.000+02:00
diff --git a/Python/import.c b/Python/import.c
@@ -1639,14 +1639,14 @@ 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);
                 }
                 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 {

Original file line number	Diff line number	Diff line change
`@@ -1639,14 +1639,14 @@ PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,`
`1639`	`1639`
`1640`	`1640`	`if (level == 0) {`
`1641`	`1641`	`final_mod = PyDict_GetItem(interp->modules, front);`
`1642`		`- Py_DECREF(front);`
`1643`	`1642`	`if (final_mod == NULL) {`
`1644`	`1643`	`PyErr_Format(PyExc_KeyError,`
`1645`	`1644`	`"%R not in sys.modules as expected", front);`
`1646`	`1645`	`}`
`1647`	`1646`	`else {`
`1648`	`1647`	`Py_INCREF(final_mod);`
`1649`	`1648`	`}`
	`1649`	`+ Py_DECREF(front);`
`1650`	`1650`	`}`
`1651`	`1651`	`else {`
`1652`	`1652`	`Py_ssize_t cut_off = PyUnicode_GET_LENGTH(name) -`
`@@ -1660,7 +1660,6 @@ PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,`
`1660`	`1660`	`}`
`1661`	`1661`
`1662`	`1662`	`final_mod = PyDict_GetItem(interp->modules, to_return);`
`1663`		`- Py_DECREF(to_return);`
`1664`	`1663`	`if (final_mod == NULL) {`
`1665`	`1664`	`PyErr_Format(PyExc_KeyError,`
`1666`	`1665`	`"%R not in sys.modules as expected",`
`@@ -1669,6 +1668,7 @@ PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,`
`1669`	`1668`	`else {`
`1670`	`1669`	`Py_INCREF(final_mod);`
`1671`	`1670`	`}`
	`1671`	`+ Py_DECREF(to_return);`
`1672`	`1672`	`}`
`1673`	`1673`	`}`
`1674`	`1674`	`else {`