From b76ad5121e2cfa89d6476d700cbcb65b7ffc39ac Mon Sep 17 00:00:00 2001
From: Xiang Zhang <angwerzx@126.com>
Date: Mon, 6 Mar 2017 17:17:05 +0800
Subject: bpo-29714:  Fix a regression that bytes format may fail when
 containing zero bytes inside. (GH-499)

---
 Objects/bytesobject.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Objects/bytesobject.c')

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index a30ac0c379..f0ddb95de5 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);
-- 
cgit v1.2.1