merge

rhettinger · rhettinger · commit 4e6bf4b3da03 · 2015-05-11T19:59:21.000-07:00
diff --git 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);
