From: Zackery Spytz <zspytz@gmail.com>
Date: Mon, 22 Apr 2019 23:35:55 +0000 (-0600)
Subject: [2.7] bpo-9194: Fix the bounds checking in winreg.c's fixupMultiSZ() (GH-12687) ... 
X-Git-Tag: v2.7.17rc1~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84efbaecaf50b771cc7a95fd9dd9602bd31de305;p=thirdparty%2FPython%2Fcpython.git

[2.7] bpo-9194: Fix the bounds checking in winreg.c's fixupMultiSZ() (GH-12687) (GH-12916)



(cherry picked from commit 56ed86490cb8221c874d432461d77702437f63e5)



https://bugs.python.org/issue9194
---

diff --git a/PC/_winreg.c b/PC/_winreg.c
index f0f8df33107b..3b887e075334 100644
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -727,7 +727,7 @@ fixupMultiSZ(char **str, char *data, int len)
     Q = data + len;
     for (P = data, i = 0; P < Q && *P != '\0'; P++, i++) {
         str[i] = P;
-        for(; *P != '\0'; P++)
+        for (; P < Q && *P != '\0'; P++)
             ;
     }
 }