summaryrefslogtreecommitdiff
path: root/Objects/listobject.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-07-17 21:58:01 +0200
committerVictor Stinner <victor.stinner@gmail.com>2013-07-17 21:58:01 +0200
commitc50cbdbec824a1fc21945f79917e9cfb7cd7dfc0 (patch)
tree54567a2e076952d22afef83f28db1ede70b17649 /Objects/listobject.c
parent352ce458dc0b97db04c87fd82f793797d65c820c (diff)
downloadcpython-c50cbdbec824a1fc21945f79917e9cfb7cd7dfc0.tar.gz
Issue #18408: Fix listpop(), handle list_ass_slice() failure
Diffstat (limited to 'Objects/listobject.c')
-rw-r--r--Objects/listobject.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 0ec70e587a..ce6b70889e 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -934,12 +934,10 @@ listpop(PyListObject *self, PyObject *args)
}
Py_INCREF(v);
status = list_ass_slice(self, i, i+1, (PyObject *)NULL);
- assert(status >= 0);
- /* Use status, so that in a release build compilers don't
- * complain about the unused name.
- */
- (void) status;
-
+ if (status < 0) {
+ Py_DECREF(v);
+ return NULL;
+ }
return v;
}