From c026c8bc1057821bba738d9d9a618d56e54b5017 Mon Sep 17 00:00:00 2001
From: Zackery Spytz <zspytz@gmail.com>
Date: Mon, 22 Apr 2019 11:01:32 -0600
Subject: [PATCH] bpo-9194: Fix the bounds checking in winreg.c's
 fixupMultiSZ() (GH-12687) (cherry picked from commit
 56ed86490cb8221c874d432461d77702437f63e5)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
---
 PC/winreg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PC/winreg.c b/PC/winreg.c
index 3fde04d746b53c..5739cf43335aa3 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++)
             ;
     }
 }