- 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 a60f3b23e1e5bba468d15796ac17db58db02f2eb..7e2c653fc49f53d584421be55cbb9edab6c7ff34 100644 (file)
--- 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 a5dc3602b2b7ce487363f4c5aa407ce834b9610e..486cf7d07d3172693e09f6cf43d8bb1d20c86de5 100644 (file)
--- 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);
                }
        }