The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize().

This commit is contained in:
Christian Heimes 2008-01-30 18:58:29 +00:00
parent 0d9244332b
commit 796fc31585
2 changed files with 8 additions and 12 deletions

View file

@ -1107,7 +1107,7 @@ PyDoc_STRVAR(flags__doc__,
\n\
Flags provided through command line arguments or environment vars.");
static PyTypeObject FlagsType;
static PyTypeObject FlagsType = {0, 0, 0, 0, 0, 0};
static PyStructSequence_Field flags_fields[] = {
{"debug", "-d"},
@ -1180,7 +1180,6 @@ make_flags(void)
if (PyErr_Occurred()) {
return NULL;
}
return seq;
}
@ -1346,7 +1345,8 @@ _PySys_Init(void)
PyDict_SetItemString(sysdict, "warnoptions", warnoptions);
}
PyStructSequence_InitType(&FlagsType, &flags_desc);
if (FlagsType.tp_name == 0)
PyStructSequence_InitType(&FlagsType, &flags_desc);
SET_SYS_FROM_STRING("flags", make_flags());
/* prevent user from creating new instances */
FlagsType.tp_init = NULL;