bpo-41604: Don't decrement the reference count of the previous user_ptr when set_panel_usertpr fails

madebr · madebr · commit 39a43784baf8 · 2020-08-21T15:24:54.000+02:00
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
@@ -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
@@ -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");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Don't decrement the reference count of the previous user_ptr when`
	`2`	`+set_panel_userptr fails.`
Original file line number	Diff line number	Diff line change
`@@ -439,8 +439,9 @@ _curses_panel_panel_set_userptr(PyCursesPanelObject self, PyObject obj)`
`439`	`439`	`if (rc == ERR) {`
`440`	`440`	`/* In case of an ncurses error, decref the new object again */`
`441`	`441`	`Py_DECREF(obj);`
	`442`	`+ } else {`
	`443`	`+ Py_XDECREF(oldobj);`
`442`	`444`	`}`
`443`		`- Py_XDECREF(oldobj);`
`444`	`445`	`return PyCursesCheckERR(rc, "set_panel_userptr");`
`445`	`446`	`}`
`446`	`447`