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

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fixed ext/bz2/tests/005.phpt test failure introduesed by 09547c64c2
This commit is contained in:
Dmitry Stogov 2021-12-02 10:34:14 +03:00
commit 4eaba3e2ed
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_execute.c
View file

@ -1676,6 +1676,9 @@ static zend_never_inline void zend_assign_to_string_offset(zval *str, zval *dim,
} else {
s = zend_string_init(Z_STRVAL_P(str), Z_STRLEN_P(str), 0);
ZSTR_H(s) = ZSTR_H(Z_STR_P(str));
if (Z_REFCOUNTED_P(str)) {
zend_string_release_ex(Z_STR_P(str), 0);
}
ZVAL_NEW_STR(str, s);
}

3
ext/opcache/jit/zend_jit_helpers.c
View file

@ -947,6 +947,9 @@ static zend_never_inline void zend_assign_to_string_offset(zval *str, zval *dim,
} else {
s = zend_string_init(Z_STRVAL_P(str), Z_STRLEN_P(str), 0);
ZSTR_H(s) = ZSTR_H(Z_STR_P(str));
if (Z_REFCOUNTED_P(str)) {
zend_string_release_ex(Z_STR_P(str), 0);
}
ZVAL_NEW_STR(str, s);
}