Kaydet (Commit) 9a68f8c3 authored tarafından Christian Heimes's avatar Christian Heimes

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.
üst eb9b39bd
...@@ -217,6 +217,9 @@ Py_InitializeEx(int install_sigs) ...@@ -217,6 +217,9 @@ Py_InitializeEx(int install_sigs)
Py_FatalError("Py_Initialize: can't initialize builtins dict"); Py_FatalError("Py_Initialize: can't initialize builtins dict");
Py_INCREF(interp->builtins); Py_INCREF(interp->builtins);
/* initialize builtin exceptions */
_PyExc_Init();
sysmod = _PySys_Init(); sysmod = _PySys_Init();
if (sysmod == NULL) if (sysmod == NULL)
Py_FatalError("Py_Initialize: can't initialize sys"); Py_FatalError("Py_Initialize: can't initialize sys");
...@@ -239,9 +242,6 @@ Py_InitializeEx(int install_sigs) ...@@ -239,9 +242,6 @@ Py_InitializeEx(int install_sigs)
_PyImport_Init(); _PyImport_Init();
/* initialize builtin exceptions */
_PyExc_Init();
/* phase 2 of builtins */ /* phase 2 of builtins */
_PyImport_FixupExtension("__builtin__", "__builtin__"); _PyImport_FixupExtension("__builtin__", "__builtin__");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment