[Python-checkins] r74277 - in python/trunk: Misc/NEWS Python/getargs.c

Sun Aug 2 01:55:00 CEST 2009

Author: sean.reifschneider
Date: Sun Aug 2 01:54:55 2009
New Revision: 74277
Log:
- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
 NUL: Bogus TypeError detail string.
Modified:
 python/trunk/Misc/NEWS
 python/trunk/Python/getargs.c
Modified: python/trunk/Misc/NEWS
==============================================================================

--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Aug 2 01:54:55 2009
@@ -1180,6 +1180,9 @@
 C-API
 -----
 
+- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with 
+ NUL: Bogus TypeError detail string.
+
 - Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of
 PyCode_Addr2Line().
 
Modified: python/trunk/Python/getargs.c
==============================================================================
--- python/trunk/Python/getargs.c	(original)
+++ python/trunk/Python/getargs.c	Sun Aug 2 01:54:55 2009
@@ -328,7 +328,7 @@
 				 flags, levels, msgbuf, 
 				 sizeof(msgbuf), &freelist);
 		if (msg) {
-			seterror(i+1, msg, levels, fname, message);
+			seterror(i+1, msg, levels, fname, msg);
 			return cleanreturn(0, freelist);
 		}
 	}
