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.
This commit is contained in:
Victor Stinner 2010-03-03 21:53:41 +00:00
parent ac80c157c7
commit 2379bb664a
1 changed files with 8 additions and 5 deletions

View File

@ -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);
}