Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit 5832be768c1e · 2021-03-24T11:52:54.000+01:00
* PHP-7.4:
  Fix #73533: Invalid memory access in php_libxml_xmlCheckUTF8
diff --git a/NEWS b/NEWS
@@ -13,6 +13,9 @@ PHP                                                                        NEWS
   . Fixed bug #80024 (Duplication of info about inherited socket after pool
     removing). (Jakub Zelenka)
 
+- LibXML:
+  . Fixed bug #73533 (Invalid memory access in php_libxml_xmlCheckUTF8). (cmb)
+
 - Opcache:
   . Fixed bug #80839 (PHP problem with JIT). (Dmitry)
   . Fixed bug #80861 (erronous array key overflow in 2D array with JIT).
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
@@ -1158,7 +1158,7 @@ PHP_FUNCTION(libxml_set_external_entity_loader)
 /* {{{ Common functions shared by extensions */
 int php_libxml_xmlCheckUTF8(const unsigned char *s)
 {
-	int i;
+	size_t i;
 	unsigned char c;
 
 	for (i = 0; (c = s[i++]);) {

Original file line number	Diff line number	Diff line change
`@@ -1158,7 +1158,7 @@ PHP_FUNCTION(libxml_set_external_entity_loader)`
`1158`	`1158`	`/* {{{ Common functions shared by extensions */`
`1159`	`1159`	`int php_libxml_xmlCheckUTF8(const unsigned char *s)`
`1160`	`1160`	`{`
`1161`		`- int i;`
	`1161`	`+ size_t i;`
`1162`	`1162`	`unsigned char c;`
`1163`	`1163`
`1164`	`1164`	`for (i = 0; (c = s[i++]);) {`