diff options
| author | Collin Winter <collinw@gmail.com> | 2007-03-12 16:11:39 +0000 |
|---|---|---|
| committer | Collin Winter <collinw@gmail.com> | 2007-03-12 16:11:39 +0000 |
| commit | 42d6631380e175b9bab7a1dfbb08e0e2fe036565 (patch) | |
| tree | ec6c42ce54aef1f150511089fc3ede1bf01a88d7 /Python/pythonrun.c | |
| parent | dd50493ced7cccac433999a0092ef509a7e6fa91 (diff) | |
| download | cpython-42d6631380e175b9bab7a1dfbb08e0e2fe036565.tar.gz | |
Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167.
Will backport.
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 3a9e75e237..3e5ecfe3f6 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -194,6 +194,9 @@ Py_InitializeEx(int install_sigs) 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 */ @@ -531,6 +534,7 @@ Py_NewInterpreter(void) /* 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) { |