diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-03-24 11:52:27 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-03-24 11:52:54 +0100 |
| commit | 5832be768c1e9e28bfdedbf8fba91a3fa2baedc1 (patch) | |
| tree | 3202cb9105eb4a11c739a4a4acd4b7a12cc86099 | |
| parent | 733b5143261ec5d54647632dc3493f37608c206d (diff) | |
| parent | 498eb8e0529fbe1dd8a91ae3ee8592eda868d3aa (diff) | |
| download | php-git-5832be768c1e9e28bfdedbf8fba91a3fa2baedc1.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #73533: Invalid memory access in php_libxml_xmlCheckUTF8
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/libxml/libxml.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 index fab8c3cf07..cc4850ffbe 100644 --- 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++]);) { |