From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 5 Sep 2006 02:33:44 +0000 (+0000)
Subject: Backport fix from 51683.
X-Git-Tag: v2.5c2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=716692ff13ac13278da4eb078b2b1e46eaf4aab1;p=python

Backport fix from 51683.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index d7a118b647..76c4eed8fc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,8 @@ Library
 Extension Modules
 -----------------
 
+- Bug #1548092: fix curses.tparm seg fault on invalid input.
+
 - Bug #1550714: fix SystemError from itertools.tee on negative value for n.
 
 
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);
 }