From eb846939b1ecc45fbc4898f4234fea128e8f9551 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 19 Dec 2019 23:11:08 +0300 Subject: Fixed bug #78999 (Cycle leak when using function result as temporary) --- Zend/zend_vm_execute.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'Zend/zend_vm_execute.h') diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index d80a5f704d..e893e35b6d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2727,6 +2727,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RETURN_SPEC_CONST_ if (EXPECTED(!Z_OPT_ISREF_P(retval_ptr))) { ZVAL_COPY_VALUE(return_value, retval_ptr); if (EXPECTED(!(EX_CALL_INFO() & ZEND_CALL_CODE))) { + zend_refcounted *ref = Z_COUNTED_P(retval_ptr); + if (GC_MAY_LEAK(ref)) { + gc_possible_root(ref); + } ZVAL_NULL(retval_ptr); } else { Z_ADDREF_P(return_value); @@ -17665,6 +17669,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RETURN_SPEC_TMP_HA if (EXPECTED(!Z_OPT_ISREF_P(retval_ptr))) { ZVAL_COPY_VALUE(return_value, retval_ptr); if (EXPECTED(!(EX_CALL_INFO() & ZEND_CALL_CODE))) { + zend_refcounted *ref = Z_COUNTED_P(retval_ptr); + if (GC_MAY_LEAK(ref)) { + gc_possible_root(ref); + } ZVAL_NULL(retval_ptr); } else { Z_ADDREF_P(return_value); @@ -20433,6 +20441,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RETURN_SPEC_VAR_HA if (EXPECTED(!Z_OPT_ISREF_P(retval_ptr))) { ZVAL_COPY_VALUE(return_value, retval_ptr); if (EXPECTED(!(EX_CALL_INFO() & ZEND_CALL_CODE))) { + zend_refcounted *ref = Z_COUNTED_P(retval_ptr); + if (GC_MAY_LEAK(ref)) { + gc_possible_root(ref); + } ZVAL_NULL(retval_ptr); } else { Z_ADDREF_P(return_value); @@ -36875,6 +36887,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RETURN_SPEC_CV_HAN if (EXPECTED(!Z_OPT_ISREF_P(retval_ptr))) { ZVAL_COPY_VALUE(return_value, retval_ptr); if (EXPECTED(!(EX_CALL_INFO() & ZEND_CALL_CODE))) { + zend_refcounted *ref = Z_COUNTED_P(retval_ptr); + if (GC_MAY_LEAK(ref)) { + gc_possible_root(ref); + } ZVAL_NULL(retval_ptr); } else { Z_ADDREF_P(return_value); @@ -55714,6 +55730,10 @@ zend_leave_helper_SPEC_LABEL: if (EXPECTED(!Z_OPT_ISREF_P(retval_ptr))) { ZVAL_COPY_VALUE(return_value, retval_ptr); if (EXPECTED(!(EX_CALL_INFO() & ZEND_CALL_CODE))) { + zend_refcounted *ref = Z_COUNTED_P(retval_ptr); + if (GC_MAY_LEAK(ref)) { + gc_possible_root(ref); + } ZVAL_NULL(retval_ptr); } else { Z_ADDREF_P(return_value); @@ -57328,6 +57348,10 @@ zend_leave_helper_SPEC_LABEL: if (EXPECTED(!Z_OPT_ISREF_P(retval_ptr))) { ZVAL_COPY_VALUE(return_value, retval_ptr); if (EXPECTED(!(EX_CALL_INFO() & ZEND_CALL_CODE))) { + zend_refcounted *ref = Z_COUNTED_P(retval_ptr); + if (GC_MAY_LEAK(ref)) { + gc_possible_root(ref); + } ZVAL_NULL(retval_ptr); } else { Z_ADDREF_P(return_value); @@ -57614,6 +57638,10 @@ zend_leave_helper_SPEC_LABEL: if (EXPECTED(!Z_OPT_ISREF_P(retval_ptr))) { ZVAL_COPY_VALUE(return_value, retval_ptr); if (EXPECTED(!(EX_CALL_INFO() & ZEND_CALL_CODE))) { + zend_refcounted *ref = Z_COUNTED_P(retval_ptr); + if (GC_MAY_LEAK(ref)) { + gc_possible_root(ref); + } ZVAL_NULL(retval_ptr); } else { Z_ADDREF_P(return_value); @@ -59256,6 +59284,10 @@ zend_leave_helper_SPEC_LABEL: if (EXPECTED(!Z_OPT_ISREF_P(retval_ptr))) { ZVAL_COPY_VALUE(return_value, retval_ptr); if (EXPECTED(!(EX_CALL_INFO() & ZEND_CALL_CODE))) { + zend_refcounted *ref = Z_COUNTED_P(retval_ptr); + if (GC_MAY_LEAK(ref)) { + gc_possible_root(ref); + } ZVAL_NULL(retval_ptr); } else { Z_ADDREF_P(return_value); -- cgit v1.2.1