]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-43108: Fix a reference leak in the curses module (GH-24420)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 3 Feb 2021 13:41:09 +0000 (05:41 -0800)
committerGitHub <noreply@github.com>
Wed, 3 Feb 2021 13:41:09 +0000 (05:41 -0800)
(cherry picked from commit bb739ec922c6992a2be38f9fd3c544c2cc322dde)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
Misc/NEWS.d/next/Library/2021-02-02-20-23-31.bpo-43108.lqcCZ6.rst [new file with mode: 0644]
Modules/_cursesmodule.c

diff --git a/Misc/NEWS.d/next/Library/2021-02-02-20-23-31.bpo-43108.lqcCZ6.rst b/Misc/NEWS.d/next/Library/2021-02-02-20-23-31.bpo-43108.lqcCZ6.rst
new file mode 100644 (file)
index 0000000..8e45640
--- /dev/null
@@ -0,0 +1 @@
+Fixed a reference leak in the :mod:`curses` module. Patch by Pablo Galindo
index d129248e363472060024af27ba3e19564df9b4e3..c84f8382274b5e4d12bc6902a2ae9e24f513fafd 100644 (file)
@@ -365,6 +365,7 @@ PyCurses_ConvertToString(PyCursesWindowObject *win, PyObject *obj,
         *bytes = obj;
         /* check for embedded null bytes */
         if (PyBytes_AsStringAndSize(*bytes, &str, NULL) < 0) {
+            Py_DECREF(obj);
             return 0;
         }
         return 1;
@@ -679,8 +680,9 @@ _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,
 #else
     strtype = PyCurses_ConvertToString(self, str, &bytesobj, NULL);
 #endif
-    if (strtype == 0)
+    if (strtype == 0) {
         return NULL;
+    }
     if (use_attr) {
         attr_old = getattrs(self->win);
         (void)wattrset(self->win,attr);