From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 2 Sep 2006 02:50:35 +0000 (+0000)
Subject: Bug #1548092: fix curses.tparm seg fault on invalid input.  Needs backport to 2.5... 
X-Git-Tag: v2.6a1~2725
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6aefa916a96f7d3ce7f634134dba6060c68b647a;p=python

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 757e28b44d..fe3ed7994c 100644
--- 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 2921d53a8f..aeb1ef5f22 100644
--- 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);
 }