[Backport of rev. 51683 by neal.norwitz]

Bug #1548092: fix curses.tparm seg fault on invalid input.  Needs
backport to 2.5.1 and earlier.

diff --git a/Misc/NEWS b/Misc/NEWS
index ea9debd843c0c36d5cd874afd01b0f6a0fd67f94..aa9cb10346d52775b657c3fd1652bab5bc4da72c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,8 @@ Extension Modules
 - Bug #1471938: Fix curses module build problem on Solaris 8; patch by
   Paul Eggert.
 
+- Bug #1548092: fix curses.tparm() segfault on invalid input.
+
 - cursesmodule: fix a number of reference leaks with 'python -v'; handle
   failure from PyModule_GetDict (Klocwork 208).
 

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index e179e0e24e9e1d4d768d300781e472030556ded1..a5617b58f580b367c36483a417044c90b229f4ac 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -2278,6 +2278,10 @@ PyCurses_tparm(PyObject *self, PyObject *args)
        }
 
        result = tparm(fmt,i1,i2,i3,i4,i5,i6,i7,i8,i9);
+       if (!result) {
+               PyErr_SetString(PyCursesError, "tparm() returned NULL");
+               return NULL;
+       }
 
        return PyString_FromString(result);
 }