Issue #19437: Cleanup r_ref() of the marshal module

vstinner · vstinner · commit 359fabc19f28 · 2013-10-31T17:09:01.000+01:00
diff --git a/Python/marshal.c b/Python/marshal.c
@@ -827,11 +827,12 @@ r_ref_insert(PyObject *o, Py_ssize_t idx, int flag, RFILE *p)
 static PyObject *
 r_ref(PyObject *o, int flag, RFILE *p)
 {
-    if (o != NULL && flag) { /* currently only FLAG_REF is defined */
-        if (PyList_Append(p->refs, o) < 0) {
-            Py_DECREF(o); /* release the new object */
-            return NULL;
-        }
+    assert(flag & FLAG_REF);
+    if (o == NULL)
+        return NULL;
+    if (PyList_Append(p->refs, o) < 0) {
+        Py_DECREF(o); /* release the new object */
+        return NULL;
     }
     return o;
 }

Original file line number	Diff line number	Diff line change
`@@ -827,11 +827,12 @@ r_ref_insert(PyObject o, Py_ssize_t idx, int flag, RFILE p)`
`827`	`827`	`static PyObject *`
`828`	`828`	`r_ref(PyObject o, int flag, RFILE p)`
`829`	`829`	`{`
`830`		`- if (o != NULL && flag) { /* currently only FLAG_REF is defined */`
`831`		`- if (PyList_Append(p->refs, o) < 0) {`
`832`		`- Py_DECREF(o); /* release the new object */`
`833`		`- return NULL;`
`834`		`- }`
	`830`	`+ assert(flag & FLAG_REF);`
	`831`	`+ if (o == NULL)`
	`832`	`+ return NULL;`
	`833`	`+ if (PyList_Append(p->refs, o) < 0) {`
	`834`	`+ Py_DECREF(o); /* release the new object */`
	`835`	`+ return NULL;`
`835`	`836`	`}`
`836`	`837`	`return o;`
`837`	`838`	`}`