Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 78636 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78636 | victor.stinner | 2010-03-03 22:56:53 +0100 (mer., 03 mars 2010) | 12 lines

  Merged revisions 78635 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78635 | victor.stinner | 2010-03-03 22:53:41 +0100 (mer., 03 mars 2010) | 5 lines

    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:57:58 +00:00
parent 1ff0c6c9f8
commit 925ca76ae7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/_curses_panel.c
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);
}