diff options
| author | Xiang Zhang <angwerzx@126.com> | 2017-03-06 10:17:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-06 10:17:10 (GMT) |
| commit | df6d7b406f3d1b2e4e2014751bfa25574c4df222 (patch) | |
| tree | 17be021c71e543c71a5e2e21e929d481c096fd2d /Objects/bytesobject.c | |
| parent | 4e1a065c20856a00d0fe88ce022b249170608058 (diff) | |
| download | cpython-df6d7b406f3d1b2e4e2014751bfa25574c4df222.zip cpython-df6d7b406f3d1b2e4e2014751bfa25574c4df222.tar.gz cpython-df6d7b406f3d1b2e4e2014751bfa25574c4df222.tar.bz2 | |
[3.6] bpo-29714: Fix a regression that bytes format may fail when containing zero bytes inside. (GH-504)
Diffstat (limited to 'Objects/bytesobject.c')
| -rw-r--r-- | Objects/bytesobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 5d48440..801711f 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -619,11 +619,11 @@ _PyBytes_FormatEx(const char *format, Py_ssize_t format_len, Py_ssize_t len; char *pos; - pos = strchr(fmt + 1, '%'); + pos = (char *)memchr(fmt + 1, '%', fmtcnt); if (pos != NULL) len = pos - fmt; else - len = format_len - (fmt - format); + len = fmtcnt + 1; assert(len != 0); memcpy(res, fmt, len); |