From 39a43784baf89630d6bbbcdb42fa82aea760232f Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 21 Aug 2020 02:25:00 +0200 Subject: [PATCH] bpo-41604: Don't decrement the reference count of the previous user_ptr when set_panel_usertpr fails --- .../next/Library/2020-08-21-15-24-14.bpo-41604.rTXleO.rst | 2 ++ Modules/_curses_panel.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2020-08-21-15-24-14.bpo-41604.rTXleO.rst diff --git a/Misc/NEWS.d/next/Library/2020-08-21-15-24-14.bpo-41604.rTXleO.rst b/Misc/NEWS.d/next/Library/2020-08-21-15-24-14.bpo-41604.rTXleO.rst new file mode 100644 index 00000000000000..0f9794cbdb321e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-08-21-15-24-14.bpo-41604.rTXleO.rst @@ -0,0 +1,2 @@ +Don't decrement the reference count of the previous user_ptr when +set_panel_userptr fails. diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c index f124803493d88b..024422ef33aa34 100644 --- a/Modules/_curses_panel.c +++ b/Modules/_curses_panel.c @@ -439,8 +439,9 @@ _curses_panel_panel_set_userptr(PyCursesPanelObject *self, PyObject *obj) if (rc == ERR) { /* In case of an ncurses error, decref the new object again */ Py_DECREF(obj); + } else { + Py_XDECREF(oldobj); } - Py_XDECREF(oldobj); return PyCursesCheckERR(rc, "set_panel_userptr"); }