mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

#18113: avoid segfault if Py_XDECREF triggers code that calls set_panel_userptr again

Browse source 
Problem noted & original patch by Serhiy Storchaka; I tweaked the patch a bit.
This commit is contained in:
Andrew Kuchling 2013-06-22 14:50:56 -04:00
parent 45d9493ee9
commit 9290dd14b0
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/_curses_panel.c
View file

@ -323,12 +323,17 @@ static PyObject *
PyCursesPanel_set_panel_userptr(PyCursesPanelObject *self, PyObject *obj)
{
PyObject *oldobj;
int rc;
PyCursesInitialised;
oldobj = (PyObject *) panel_userptr(self->pan);
Py_XDECREF(oldobj);
Py_INCREF(obj);
return PyCursesCheckERR(set_panel_userptr(self->pan, (void*)obj),
"set_panel_userptr");
oldobj = (PyObject *) panel_userptr(self->pan);
rc = set_panel_userptr(self->pan, (void*)obj);
if (rc == ERR) {
/* In case of an ncurses error, decref the new object again */
Py_DECREF(obj);
}
Py_XDECREF(oldobj);
return PyCursesCheckERR(rc, "set_panel_userptr");
}
static PyObject *