diff Python/pythonrun.c @ 41131:66f265ac4ec4 2.5

Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Backported from r54291.
author Collin Winter <collinw@gmail.com>
date Mon, 12 Mar 2007 16:49:23 +0000
parents 1080de49c81e
children a3bf55a03f66
line wrap: on
line diff
--- a/Python/pythonrun.c	Mon Mar 12 16:15:17 2007 +0000
+++ b/Python/pythonrun.c	Mon Mar 12 16:49:23 2007 +0000
@@ -193,6 +193,9 @@
 	interp->modules = PyDict_New();
 	if (interp->modules == NULL)
 		Py_FatalError("Py_Initialize: can't make modules dictionary");
+	interp->modules_reloading = PyDict_New();
+	if (interp->modules_reloading == NULL)
+		Py_FatalError("Py_Initialize: can't make modules_reloading dictionary");
 
 #ifdef Py_USING_UNICODE
 	/* Init Unicode implementation; relies on the codec registry */
@@ -530,6 +533,7 @@
 	/* XXX The following is lax in error checking */
 
 	interp->modules = PyDict_New();
+	interp->modules_reloading = PyDict_New();
 
 	bimod = _PyImport_FindExtension("__builtin__", "__builtin__");
 	if (bimod != NULL) {