_PyObject_GC_New: Could call PyObject_INIT with a NULL 1st argument.

tim-one · tim-one · commit fa8efab30f74 · 2002-04-28T01:57:25.000Z
_PyObject_GC_NewVar:  Could call PyObject_INIT_VAR likewise.

Bugfix candidate.
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -878,15 +878,19 @@ PyObject *
 _PyObject_GC_New(PyTypeObject *tp)
 {
 	PyObject *op = _PyObject_GC_Malloc(_PyObject_SIZE(tp));
-	return PyObject_INIT(op, tp);
+	if (op != NULL)
+		op = PyObject_INIT(op, tp);
+	return op;
 }
 
 PyVarObject *
 _PyObject_GC_NewVar(PyTypeObject *tp, int nitems)
 {
 	const size_t size = _PyObject_VAR_SIZE(tp, nitems);
 	PyVarObject *op = (PyVarObject *) _PyObject_GC_Malloc(size);
-	return PyObject_INIT_VAR(op, tp, nitems);
+	if (op != NULL)
+		op = PyObject_INIT_VAR(op, tp, nitems);
+	return op;
 }
 
 PyVarObject *

Original file line number	Diff line number	Diff line change
`@@ -878,15 +878,19 @@ PyObject *`
`878`	`878`	`_PyObject_GC_New(PyTypeObject *tp)`
`879`	`879`	`{`
`880`	`880`	`PyObject *op = _PyObject_GC_Malloc(_PyObject_SIZE(tp));`
`881`		`- return PyObject_INIT(op, tp);`
	`881`	`+ if (op != NULL)`
	`882`	`+ op = PyObject_INIT(op, tp);`
	`883`	`+ return op;`
`882`	`884`	`}`
`883`	`885`
`884`	`886`	`PyVarObject *`
`885`	`887`	`_PyObject_GC_NewVar(PyTypeObject *tp, int nitems)`
`886`	`888`	`{`
`887`	`889`	`const size_t size = _PyObject_VAR_SIZE(tp, nitems);`
`888`	`890`	`PyVarObject op = (PyVarObject ) _PyObject_GC_Malloc(size);`
`889`		`- return PyObject_INIT_VAR(op, tp, nitems);`
	`891`	`+ if (op != NULL)`
	`892`	`+ op = PyObject_INIT_VAR(op, tp, nitems);`
	`893`	`+ return op;`
`890`	`894`	`}`
`891`	`895`
`892`	`896`	`PyVarObject *`