SF # 654974, fix unchecked return values in structseq
Check return values after memory allocation.
Also use Py_True instead of PyInt_FromLong(1) for bool value.
Backport candidate.
diff --git a/Objects/structseq.c b/Objects/structseq.c
index e14e4ca..effe360 100644
--- a/Objects/structseq.c
+++ b/Objects/structseq.c
@@ -150,6 +150,9 @@
}
res = (PyStructSequence*) PyStructSequence_New(type);
+ if (res == NULL) {
+ return NULL;
+ }
for (i = 0; i < len; ++i) {
PyObject *v = PySequence_Fast_GET_ITEM(arg, i);
Py_INCREF(v);
@@ -360,6 +363,8 @@
type->tp_itemsize = 0;
members = PyMem_NEW(PyMemberDef, n_members-n_unnamed_members+1);
+ if (members == NULL)
+ return;
for (i = k = 0; i < n_members; ++i) {
if (desc->fields[i].name == PyStructSequence_UnnamedField)
@@ -387,6 +392,5 @@
PyInt_FromLong((long) n_members));
PyDict_SetItemString(dict, unnamed_fields_key,
PyInt_FromLong((long) n_unnamed_members));
- PyDict_SetItemString(dict, "__safe_for_unpickling__",
- PyInt_FromLong(1));
+ PyDict_SetItemString(dict, "__safe_for_unpickling__", Py_True);
}