From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 31 Jan 2021 20:51:23 +0000 (-0800)
Subject: [3.9] bpo-41604: Don't decrement the reference count of the previous user_ptr when... 
X-Git-Tag: v3.8.8rc1~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=931263baab62b1c3fa7647e45ec6ee6ef4409e7c;p=thirdparty%2FPython%2Fcpython.git

[3.9] bpo-41604: Don't decrement the reference count of the previous user_ptr when set_panel_usertpr fails (GH-21933). (GH-24403)


(cherry picked from commit 3243e8a4b4b4cf321f9b28335d565742a34b1976)

Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
(cherry picked from commit 3c8d6934436e20163be802f5239c5b4e4925eeec)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

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 000000000000..0f9794cbdb32
--- /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 53849e3a29cc..d22e2adf89c8 100644
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -433,7 +433,9 @@ _curses_panel_panel_set_userptr(PyCursesPanelObject *self, PyObject *obj)
         /* In case of an ncurses error, decref the new object again */
         Py_DECREF(obj);
     }
-    Py_XDECREF(oldobj);
+    else {
+        Py_XDECREF(oldobj);
+    }
     return PyCursesCheckERR(rc, "set_panel_userptr");
 }