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

ZackerySpytz · zooba · commit 56ed86490cb8 · 2019-04-22T10:01:32.000-07:00
diff --git a/PC/winreg.c b/PC/winreg.c
@@ -521,7 +521,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++)
             ;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ fixupMultiSZ(wchar_t *str, wchar_t data, int len)`
`521`	`521`	`Q = data + len;`
`522`	`522`	`for (P = data, i = 0; P < Q && *P != '\0'; P++, i++) {`
`523`	`523`	`str[i] = P;`
`524`		`- for(; *P != '\0'; P++)`
	`524`	`+ for (; P < Q && *P != '\0'; P++)`
`525`	`525`	`;`
`526`	`526`	`}`
`527`	`527`	`}`