From 359fabc19f28187305c9212796f390b5b4d8d64a Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 31 Oct 2013 17:09:01 +0100 Subject: [PATCH] Issue #19437: Cleanup r_ref() of the marshal module --- Python/marshal.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Python/marshal.c b/Python/marshal.c index e19aff06d22..e211a0f0182 100644 --- 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; }