Issue #18408: Fix heapq.heappop(), handle PyList_SetSlice() failure

6962ebac · Victor Stinner · b2f56d74 · 6962ebac
Commit 6962ebac authored Jul 17, 2013 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Modules/_heapqmodule.c Modules/_heapqmodule.c +4 -1

No files found.
--- a/Modules/_heapqmodule.c
+++ b/Modules/_heapqmodule.c
@@ -168,7 +168,10 @@ heappop(PyObject *self, PyObject *heap)

    lastelt = PyList_GET_ITEM(heap, n-1) ;
    Py_INCREF(lastelt);
-    PyList_SetSlice(heap, n-1, n, NULL);
+    if (PyList_SetSlice(heap, n-1, n, NULL) < 0) {
+        Py_DECREF(lastelt);
+        return NULL;
+    }
    n--;

    if (!n)