Mercurial > cpython-lru_cache-weakref

diff Python/import.c @ 39962:de7c0cb5a872 2.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[Backport r50678 | neal.norwitz] Fix memory leak under some conditions. Reported by Klocwork, #98.
author Andrew M. Kuchling <amk@amk.ca>
date Tue, 03 Oct 2006 18:32:25 +0000
parents 6fb46e87d5f9
children 1f588a982cc5
line wrap: on
line diff
--- a/Python/import.c	Tue Oct 03 18:29:35 2006 +0000
+++ b/Python/import.c	Tue Oct 03 18:32:25 2006 +0000
@@ -1847,11 +1847,10 @@
 	if (co == NULL)
 		return -1;
 	if (!PyCode_Check(co)) {
-		Py_DECREF(co);
 		PyErr_Format(PyExc_TypeError,
 			     "frozen object %.200s is not a code object",
 			     name);
-		return -1;
+		goto err_return;
 	}
 	if (ispackage) {
 		/* Set __path__ to the package name */
@@ -1859,22 +1858,25 @@
 		int err;
 		m = PyImport_AddModule(name);
 		if (m == NULL)
-			return -1;
+			goto err_return;
 		d = PyModule_GetDict(m);
 		s = PyString_InternFromString(name);
 		if (s == NULL)
-			return -1;
+			goto err_return;
 		err = PyDict_SetItemString(d, "__path__", s);
 		Py_DECREF(s);
 		if (err != 0)
-			return err;
+			goto err_return;
 	}
 	m = PyImport_ExecCodeModuleEx(name, co, "<frozen>");
+	if (m == NULL)
+		goto err_return;
 	Py_DECREF(co);
-	if (m == NULL)
-		return -1;
 	Py_DECREF(m);
 	return 1;
+err_return:
+	Py_DECREF(co);
+	return -1;
 }