- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with

Sean Reifscheider · Sean Reifscheider · commit 642d96a64761 · 2009-08-01T23:55:06.000Z
NUL: Bogus TypeError detail string.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -1483,6 +1483,9 @@ Build
 C-API
 -----
 
+- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
+  NUL: Bogus TypeError detail string.
+
 - Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError
   for negative arguments.  Previously, it raised TypeError.
 
diff --git a/Python/getargs.c b/Python/getargs.c
@@ -387,7 +387,7 @@ vgetargs1(PyObject *args, const char *format, va_list *p_va, int flags)
 				  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);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ vgetargs1(PyObject args, const char format, va_list *p_va, int flags)`
`387`	`387`	`flags, levels, msgbuf,`
`388`	`388`	`sizeof(msgbuf), &freelist);`
`389`	`389`	`if (msg) {`
`390`		`- seterror(i+1, msg, levels, fname, message);`
	`390`	`+ seterror(i+1, msg, levels, fname, msg);`
`391`	`391`	`return cleanreturn(0, freelist);`
`392`	`392`	`}`
`393`	`393`	`}`