Backport trunk's r42885 (thomas.wouters):

Coverity-found bug: don't use temp->next *before* checking it for NULL. Also
return rather than use it again.

diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
index b5f30cb85efcbbe8156fef092ac3384a1e261f73..01243b837cb5068fda9bae6a250345426def476b 100644 (file)
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -111,10 +111,12 @@ remove_lop(PyCursesPanelObject *po)
        free(temp);
        return;
     }
-    while (temp->next->po != po) {
-       if (temp->next == NULL)
+    while (temp->next == NULL || temp->next->po != po) {
+       if (temp->next == NULL) {
            PyErr_SetString(PyExc_RuntimeError,
                            "remove_lop: can't find Panel Object");
+           return;
+       }
        temp = temp->next;
     }
     n = temp->next->next;