Merge branch 'PHP-8.1'

dstogov · dstogov · commit 17fac12ed492 · 2021-12-02T10:35:44.000+03:00
* PHP-8.1: Fixed ext/bz2/tests/005.phpt test failure introduesed by 09547c6
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1602,6 +1602,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
@@ -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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1602,6 +1602,9 @@ static zend_never_inline void zend_assign_to_string_offset(zval str, zval dim,`
`1602`	`1602`	`} else {`
`1603`	`1603`	`s = zend_string_init(Z_STRVAL_P(str), Z_STRLEN_P(str), 0);`
`1604`	`1604`	`ZSTR_H(s) = ZSTR_H(Z_STR_P(str));`
	`1605`	`+ if (Z_REFCOUNTED_P(str)) {`
	`1606`	`+ zend_string_release_ex(Z_STR_P(str), 0);`
	`1607`	`+ }`
`1605`	`1608`	`ZVAL_NEW_STR(str, s);`
`1606`	`1609`	`}`
`1607`	`1610`
Original file line number	Diff line number	Diff line change
`@@ -947,6 +947,9 @@ static zend_never_inline void zend_assign_to_string_offset(zval str, zval dim,`
`947`	`947`	`} else {`
`948`	`948`	`s = zend_string_init(Z_STRVAL_P(str), Z_STRLEN_P(str), 0);`
`949`	`949`	`ZSTR_H(s) = ZSTR_H(Z_STR_P(str));`
	`950`	`+ if (Z_REFCOUNTED_P(str)) {`
	`951`	`+ zend_string_release_ex(Z_STR_P(str), 0);`
	`952`	`+ }`
`950`	`953`	`ZVAL_NEW_STR(str, s);`
`951`	`954`	`}`
`952`	`955`