merge

e42d343b · Raymond Hettinger · 6cdee128 · c14d0ade · e42d343b
Commit e42d343b authored May 11, 2015 by Raymond Hettinger
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

Modules/_heapqmodule.c Modules/_heapqmodule.c +5 -0

No files found.
--- a/Modules/_heapqmodule.c
+++ b/Modules/_heapqmodule.c
@@ -235,6 +235,11 @@ heappushpop(PyObject *self, PyObject *args)
        return item;
    }
+    if (PyList_GET_SIZE(heap) == 0) {
+        PyErr_SetString(PyExc_IndexError, "index out of range");
+        return NULL;
+    }
    returnitem = PyList_GET_ITEM(heap, 0);
    Py_INCREF(item);
    PyList_SET_ITEM(heap, 0, item);