traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix too early decrefs.

This commit is contained in:
Antoine Pitrou 2012-05-06 17:15:23 +02:00
parent 9d9dc8eba0
commit b78174c010
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Python/import.c
View File

@ -1639,7 +1639,6 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
if (level == 0) { if (level == 0) {
final_mod = PyDict_GetItem(interp->modules, front); final_mod = PyDict_GetItem(interp->modules, front);
Py_DECREF(front);
if (final_mod == NULL) { if (final_mod == NULL) {
PyErr_Format(PyExc_KeyError, PyErr_Format(PyExc_KeyError,
"%R not in sys.modules as expected", front); "%R not in sys.modules as expected", front);
@ -1647,6 +1646,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
else { else {
Py_INCREF(final_mod); Py_INCREF(final_mod);
} }
Py_DECREF(front);
} }
else { else {
Py_ssize_t cut_off = PyUnicode_GET_LENGTH(name) - 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); final_mod = PyDict_GetItem(interp->modules, to_return);
Py_DECREF(to_return);
if (final_mod == NULL) { if (final_mod == NULL) {
PyErr_Format(PyExc_KeyError, PyErr_Format(PyExc_KeyError,
"%R not in sys.modules as expected", "%R not in sys.modules as expected",
@ -1669,6 +1668,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
else { else {
Py_INCREF(final_mod); Py_INCREF(final_mod);
} }
Py_DECREF(to_return);
} }
} }
else { else {