diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-14 00:16:07 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-14 00:16:07 (GMT) |
| commit | 9a68f8c3041fbd91f1e1a116d6c773fab3645cf6 (patch) | |
| tree | c72553b5139722be7ad463583a3033b22c96eac9 /Python/pythonrun.c | |
| parent | eb9b39bd579b6365481542a82f2f481352f008db (diff) | |
| download | cpython-9a68f8c3041fbd91f1e1a116d6c773fab3645cf6.zip cpython-9a68f8c3041fbd91f1e1a116d6c773fab3645cf6.tar.gz cpython-9a68f8c3041fbd91f1e1a116d6c773fab3645cf6.tar.bz2 | |
Moved the initalization of the exception before the initialization of sys.
On Windows _PySys_Init() could raise an uninitialized exception which leads to a seg fault.
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 044c4a9..763f905 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -217,6 +217,9 @@ Py_InitializeEx(int install_sigs) Py_FatalError("Py_Initialize: can't initialize builtins dict"); Py_INCREF(interp->builtins); + /* initialize builtin exceptions */ + _PyExc_Init(); + sysmod = _PySys_Init(); if (sysmod == NULL) Py_FatalError("Py_Initialize: can't initialize sys"); @@ -239,9 +242,6 @@ Py_InitializeEx(int install_sigs) _PyImport_Init(); - /* initialize builtin exceptions */ - _PyExc_Init(); - /* phase 2 of builtins */ _PyImport_FixupExtension("__builtin__", "__builtin__"); |