Backport fix from 51683.

42f4bfa2 · Neal Norwitz · 7f6dff55 · 42f4bfa2 · 42f4bfa2
Commit 42f4bfa2 authored Sep 05, 2006 by Neal Norwitz
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Misc/NEWS Misc/NEWS +2 -0

Modules/_cursesmodule.c Modules/_cursesmodule.c +4 -0

No files found.
--- 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.



--- 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);
 }