summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-02-03 13:41:09 (GMT)
committerGitHub <noreply@github.com>2021-02-03 13:41:09 (GMT)
commit12bfc595c49ef9681265407fe33b53b7a3623abc (patch)
tree267618c79e07281795dc5ad6cdb4db82ccc34c19
parentf02ef7afcf67db52f169f809a1b0babb80ec8370 (diff)
downloadcpython-12bfc595c49ef9681265407fe33b53b7a3623abc.zip
cpython-12bfc595c49ef9681265407fe33b53b7a3623abc.tar.gz
cpython-12bfc595c49ef9681265407fe33b53b7a3623abc.tar.bz2
bpo-43108: Fix a reference leak in the curses module (GH-24420)
(cherry picked from commit bb739ec922c6992a2be38f9fd3c544c2cc322dde) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
-rw-r--r--Misc/NEWS.d/next/Library/2021-02-02-20-23-31.bpo-43108.lqcCZ6.rst1
-rw-r--r--Modules/_cursesmodule.c4
2 files changed, 4 insertions, 1 deletions
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
index 0000000..8e45640
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-02-02-20-23-31.bpo-43108.lqcCZ6.rst
@@ -0,0 +1 @@
+Fixed a reference leak in the :mod:`curses` module. Patch by Pablo Galindo
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index d129248..c84f838 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -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);