diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-30 18:58:29 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-30 18:58:29 +0000 |
| commit | b126d98f292b9a37cbd15545657602d1cf9f13b7 (patch) | |
| tree | 0a0bcafc678e2dfb054d92d5110caf29d9f91277 /Objects/floatobject.c | |
| parent | c34ef7c8e3ee559fa6fef2a449867947b327a60c (diff) | |
| download | cpython-b126d98f292b9a37cbd15545657602d1cf9f13b7.tar.gz | |
The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize().
Diffstat (limited to 'Objects/floatobject.c')
| -rw-r--r-- | Objects/floatobject.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 689edcdb5a..63512787a6 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -66,7 +66,7 @@ PyFloat_GetMin(void) return DBL_MIN; } -static PyTypeObject FloatInfoType = {0}; +static PyTypeObject FloatInfoType = {0, 0, 0, 0, 0, 0}; PyDoc_STRVAR(floatinfo__doc__, "sys.floatinfo\n\ @@ -105,15 +105,9 @@ static PyStructSequence_Desc floatinfo_desc = { PyObject * PyFloat_GetInfo(void) { - static PyObject* floatinfo; + PyObject* floatinfo; int pos = 0; - if (floatinfo != NULL) { - Py_INCREF(floatinfo); - return floatinfo; - } - PyStructSequence_InitType(&FloatInfoType, &floatinfo_desc); - floatinfo = PyStructSequence_New(&FloatInfoType); if (floatinfo == NULL) { return NULL; @@ -142,7 +136,6 @@ PyFloat_GetInfo(void) Py_CLEAR(floatinfo); return NULL; } - return floatinfo; } @@ -1669,6 +1662,9 @@ _PyFloat_Init(void) /* Initialize floating point repr */ _PyFloat_DigitsInit(); #endif + /* Init float info */ + if (FloatInfoType.tp_name == 0) + PyStructSequence_InitType(&FloatInfoType, &floatinfo_desc); } void |