From 878c3b004b09cb9242f7523366b616ae0715438a Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Thu, 13 Aug 2009 08:36:43 +0000 Subject: [PATCH] Merged revisions 74278 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r74278 | sean.reifschneider | 2009-08-02 01:55:06 +0200 (So, 02 Aug 2009) | 3 lines - Issue #6624: yArg_ParseTuple with "s" format when parsing argument with NUL: Bogus TypeError detail string. ........ --- Misc/NEWS | 3 +++ Python/getargs.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 8c9bb93bbf..150ea589ed 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -35,6 +35,9 @@ Core and Builtins C-API ----- +- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with + NUL: Bogus TypeError detail string. + - Issue #6405: Remove duplicate type declarations in descrobject.h. - The code flags for old __future__ features are now available again. 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); } } -- 2.50.1