From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 3 Mar 2010 21:53:41 +0000 (+0000)
Subject: Issue #3299: fix curses.panel.new_panel() error handler, replace PyObject_DEL()
X-Git-Tag: v2.7a4~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2379bb664ac33b77d076a9a8db59f73af9eb3c8f;p=python

Issue #3299: fix curses.panel.new_panel() error handler, replace PyObject_DEL()
by Py_DECREF() to avoid a crash in pydebug mode.

Use po->wo==NULL to detect than the panel is in the lop list or not.
---

diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
index 6831473b06..74e6bfa2b1 100644
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
     po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
     if (po == NULL) return NULL;
     po->pan = pan;
-    po->wo = wo;
-    Py_INCREF(wo);
     if (insert_lop(po) < 0) {
-	PyObject_DEL(po);
+	po->wo = NULL;
+	Py_DECREF(po);
 	return NULL;
     }
+    po->wo = wo;
+    Py_INCREF(wo);
     return (PyObject *)po;
 }
 
@@ -191,8 +192,10 @@ static void
 PyCursesPanel_Dealloc(PyCursesPanelObject *po)
 {
     (void)del_panel(po->pan);
-    Py_DECREF(po->wo);
-    remove_lop(po);
+    if (po->wo != NULL) {
+	Py_DECREF(po->wo);
+	remove_lop(po);
+    }
     PyObject_DEL(po);
 }