Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Lib/test/test_curses.py
Original file line number Diff line number Diff line change
Expand Up @@ -2431,6 +2431,22 @@ def __del__(self):
panel.set_userptr(A())
panel.set_userptr(None)

@requires_curses_func('panel')
def test_userptr_dealloc_segfault(self):
w = curses.newwin(10, 10)
panel = curses.panel.new_panel(w)
seen = []
class A:
def __del__(self):
# The panel is being deallocated, so it must already be off
# the stack: handing it back here would resurrect an object
# whose refcount is zero -- segfaults.
seen.append(curses.panel.top_panel() is None)
panel.set_userptr(A())
del panel
gc_collect()
self.assertEqual(seen, [True])

@cpython_only
@requires_curses_func('panel')
def test_disallow_instantiation(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix a crash in :mod:`curses.panel` when the finalizer of a panel's user
pointer runs while the panel is being deallocated. The panel is now taken
off the panel stack before its user pointer is dropped.
19 changes: 10 additions & 9 deletions Modules/_curses_panel.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,11 +437,11 @@ PyCursesPanel_Clear(PyObject *op)
PyCursesPanelObject *self = _PyCursesPanelObject_CAST(op);
PyObject *extra = (PyObject *)panel_userptr(self->pan);
if (extra != NULL) {
Py_DECREF(extra);
if (set_panel_userptr(self->pan, NULL) == ERR) {
curses_panel_panel_set_error(self, "set_panel_userptr", NULL);
return -1;
}
Py_DECREF(extra);
}
// self->wo should not be cleared because an associated WINDOW may exist
return 0;
Expand All @@ -454,20 +454,21 @@ PyCursesPanel_Dealloc(PyObject *self)
PyObject_GC_UnTrack(self);

PyCursesPanelObject *po = _PyCursesPanelObject_CAST(self);
if (PyCursesPanel_Clear(self) < 0) {
PyObject *extra = (PyObject *)panel_userptr(po->pan);
if (extra != NULL && set_panel_userptr(po->pan, NULL) == ERR) {
curses_panel_panel_set_error(po, "set_panel_userptr", "__del__");
PyErr_FormatUnraisable("Exception ignored in PyCursesPanel_Dealloc()");
}
if (po->wo != NULL && remove_lop(po) < 0) {
PyErr_SetString(PyExc_RuntimeError, "__del__: no panel object to delete");
PyErr_FormatUnraisable("Exception ignored in PyCursesPanel_Dealloc()");
}
if (del_panel(po->pan) == ERR && !PyErr_Occurred()) {
curses_panel_panel_set_error(po, "del_panel", "__del__");
PyErr_FormatUnraisable("Exception ignored in PyCursesPanel_Dealloc()");
}
if (po->wo != NULL) {
Py_DECREF(po->wo);
if (remove_lop(po) < 0) {
PyErr_SetString(PyExc_RuntimeError, "__del__: no panel object to delete");
PyErr_FormatUnraisable("Exception ignored in PyCursesPanel_Dealloc()");
}
}
Py_XDECREF(extra);
Py_XDECREF(po->wo);
tp->tp_free(po);
Py_DECREF(tp);
}
Expand Down
Loading