Fixed ext/bz2/tests/005.phpt test failure introduesed by 09547c6

php · Dec 2, 2021 · df16da3 · df16da3
1 parent 999c6f2
commit df16da3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1539,6 +1539,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);
 	}
 

diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -1136,6 +1136,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);
 	}