From: Andrew M. Kuchling <amk@amk.ca>
Date: Wed, 27 Sep 2006 19:04:53 +0000 (+0000)
Subject: [Backport of rev. 51683 by neal.norwitz]
X-Git-Tag: v2.4.4c1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c16bac18c82868e3f20a2c4ca8f329605942ff8;p=thirdparty%2FPython%2Fcpython.git

[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 ea9debd843c0..aa9cb10346d5 100644
--- 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 e179e0e24e9e..a5617b58f580 100644
--- 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);
 }