diff options
| author | Sean Reifscheider <jafo@tummy.com> | 2009-08-01 23:54:55 (GMT) |
|---|---|---|
| committer | Sean Reifscheider <jafo@tummy.com> | 2009-08-01 23:54:55 (GMT) |
| commit | 9279e7d1771a03a2e494b03d82bad2fde8b8f1aa (patch) | |
| tree | 61c4fb99810fffce643bd33e4acbfcfec9aba7b5 | |
| parent | 5c4a5d291197852cc9c312fbd8d266bc7056eb6c (diff) | |
| download | cpython-9279e7d1771a03a2e494b03d82bad2fde8b8f1aa.zip cpython-9279e7d1771a03a2e494b03d82bad2fde8b8f1aa.tar.gz cpython-9279e7d1771a03a2e494b03d82bad2fde8b8f1aa.tar.bz2 | |
- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
NUL: Bogus TypeError detail string.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/getargs.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 d24857d..1fd17d3 100644 --- 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); } } |