- 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 37ccbeb40608d45b5242d43047325d7431fa9954..ad998b4962aa09a732136411fefee5b44394d02b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1180,6 +1180,9 @@ Build
 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().
 

diff --git a/Python/getargs.c b/Python/getargs.c
index d24857d29cccd033c0769374addf48a70e6c71c8..1fd17d3ddc1130b08bca3b8418239366df48cf57 100644 (file)
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -328,7 +328,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);
                }
        }