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

diff --git a/Misc/NEWS b/Misc/NEWS
index 757e28b44d35ed68f095175fba7b9d5b3f72058b..fe3ed7994c25a4189731fe98d65c57785685c88e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,6 +25,8 @@ Library
 Extension Modules
 -----------------
 
+- Bug #1548092: fix curses.tparm seg fault on invalid input.
+
 
 Tests
 -----

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 2921d53a8f574549f3ed56550d4b08fb75721cac..aeb1ef5f22e552cb03fe49a296c60d1c6fe839e0 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -2334,6 +2334,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);
 }