From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 2 May 2019 16:00:33 +0000 (-0700)
Subject: bpo-9194: Fix the bounds checking in winreg.c's fixupMultiSZ() (GH-12687) (GH-12910)
X-Git-Tag: v3.6.9rc1~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dadc34784444950c389c120fb16f44e5a29cc43f;p=thirdparty%2FPython%2Fcpython.git

bpo-9194: Fix the bounds checking in winreg.c's fixupMultiSZ() (GH-12687) (GH-12910)

(cherry picked from commit 56ed86490cb8221c874d432461d77702437f63e5)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
---

diff --git a/PC/winreg.c b/PC/winreg.c
index 3fde04d746b5..5739cf43335a 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -520,7 +520,7 @@ fixupMultiSZ(wchar_t **str, wchar_t *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++)
             ;
     }
 }