From: Sean Reifscheider <jafo@tummy.com>
Date: Sat, 1 Aug 2009 23:55:06 +0000 (+0000)
Subject: - Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
X-Git-Tag: v3.2a1~2715
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=642d96a6476199840502a1e98d4902f7f4d47e78;p=python

- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
  NUL: Bogus TypeError detail string.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index a60f3b23e1..7e2c653fc4 100644
--- 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
index a5dc3602b2..486cf7d07d 100644
--- 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);
 		}
 	}