[Python-checkins] r51723 - in python/branches/release25-maint: Misc/NEWS Modules/_cursesmodule.c

Tue Sep 5 04:33:46 CEST 2006

Author: neal.norwitz
Date: Tue Sep 5 04:33:44 2006
New Revision: 51723
Modified:
 python/branches/release25-maint/Misc/NEWS
 python/branches/release25-maint/Modules/_cursesmodule.c
Log:
Backport fix from 51683.
Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================

--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Sep 5 04:33:44 2006
@@ -46,6 +46,8 @@
 Extension Modules
 -----------------
 
+- Bug #1548092: fix curses.tparm seg fault on invalid input.
+
 - Bug #1550714: fix SystemError from itertools.tee on negative value for n.
 
 
Modified: python/branches/release25-maint/Modules/_cursesmodule.c
==============================================================================
--- python/branches/release25-maint/Modules/_cursesmodule.c	(original)
+++ python/branches/release25-maint/Modules/_cursesmodule.c	Tue Sep 5 04:33:44 2006
@@ -2334,6 +2334,10 @@
 	}
 
 	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);
 }
