php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1'

Browse Source 
* PHP-8.1:
  JIT: Fixed memory leak in Zend/tests/concat_002.phpt introduced by fac78ee760
This commit is contained in:
Dmitry Stogov
2021-11-17 18:44:55 +03:00
parent d56ec0a624 8965d6b2ab
commit 11b2cfff5b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/opcache/jit/zend_jit_helpers.c
View File

@@ -1162,10 +1162,13 @@ static void ZEND_FASTCALL zend_jit_fast_assign_concat_helper(zval *op1, zval *op
do {
if (Z_REFCOUNTED_P(op1)) {
if (GC_REFCOUNT(Z_STR_P(op1)) == 1 && EXPECTED(Z_STR_P(op1) != Z_STR_P(op2))) {
if (GC_REFCOUNT(Z_STR_P(op1)) == 1) {
result_str = perealloc(Z_STR_P(op1), ZEND_MM_ALIGNED_SIZE(_ZSTR_STRUCT_SIZE(result_len)), 0);
ZSTR_LEN(result_str) = result_len;
zend_string_forget_hash_val(result_str);
if (UNEXPECTED(Z_STR_P(op1) == Z_STR_P(op2))) {
ZVAL_NEW_STR(op2, result_str);
}
break;
}
GC_DELREF(Z_STR_P(op1));