archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source 
* PHP-8.1:
  Fix wrong flags check for compression method in phar_object.c
  Fix missing check for xmlTextWriterEndElement
  Fix substr_replace with slots in repl_ht being UNDEF
This commit is contained in:
George Peter Banyard 2023-01-15 15:43:34 +00:00
commit ec377c687d
No known key found for this signature in database
GPG key ID: 3306078E3194AEBD
5 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/standard/string.c
View file

@ -2365,7 +2365,7 @@ PHP_FUNCTION(substr_replace)
if (HT_IS_PACKED(repl_ht)) {
while (repl_idx < repl_ht->nNumUsed) {
tmp_repl = &repl_ht->arPacked[repl_idx];
if (repl_ht != IS_UNDEF) {
if (Z_TYPE_P(tmp_repl) != IS_UNDEF) {
break;
}
repl_idx++;
@ -2373,7 +2373,7 @@ PHP_FUNCTION(substr_replace)
} else {
while (repl_idx < repl_ht->nNumUsed) {
tmp_repl = &repl_ht->arData[repl_idx].val;
if (repl_ht != IS_UNDEF) {
if (Z_TYPE_P(tmp_repl) != IS_UNDEF) {
break;
}
repl_idx++;