The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize().
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 689edcd..6351278 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -66,7 +66,7 @@
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 @@
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 @@
Py_CLEAR(floatinfo);
return NULL;
}
-
return floatinfo;
}
@@ -1669,6 +1662,9 @@
/* Initialize floating point repr */
_PyFloat_DigitsInit();
#endif
+ /* Init float info */
+ if (FloatInfoType.tp_name == 0)
+ PyStructSequence_InitType(&FloatInfoType, &floatinfo_desc);
}
void