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

dstogov · dstogov · commit df16da36972c · 2021-12-02T10:32:45.000+03:00
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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1539,6 +1539,9 @@ static zend_never_inline void zend_assign_to_string_offset(zval str, zval dim,`
`1539`	`1539`	`} else {`
`1540`	`1540`	`s = zend_string_init(Z_STRVAL_P(str), Z_STRLEN_P(str), 0);`
`1541`	`1541`	`ZSTR_H(s) = ZSTR_H(Z_STR_P(str));`
	`1542`	`+ if (Z_REFCOUNTED_P(str)) {`
	`1543`	`+ zend_string_release_ex(Z_STR_P(str), 0);`
	`1544`	`+ }`
`1542`	`1545`	`ZVAL_NEW_STR(str, s);`
`1543`	`1546`	`}`
`1544`	`1547`
Original file line number	Diff line number	Diff line change
`@@ -1136,6 +1136,9 @@ static zend_never_inline void zend_assign_to_string_offset(zval str, zval dim,`
`1136`	`1136`	`} else {`
`1137`	`1137`	`s = zend_string_init(Z_STRVAL_P(str), Z_STRLEN_P(str), 0);`
`1138`	`1138`	`ZSTR_H(s) = ZSTR_H(Z_STR_P(str));`
	`1139`	`+ if (Z_REFCOUNTED_P(str)) {`
	`1140`	`+ zend_string_release_ex(Z_STR_P(str), 0);`
	`1141`	`+ }`
`1139`	`1142`	`ZVAL_NEW_STR(str, s);`
`1140`	`1143`	`}`
`1141`	`1144`