From cd2afd99b1faa58c35a3807081e531cce0cd2311 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 31 Aug 2020 17:03:27 +0200 Subject: [PATCH] Fix leak on assign concat of array and empty string --- Zend/tests/assign_concat_array_empty_string.phpt | 13 +++++++++++++ Zend/zend_operators.c | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 Zend/tests/assign_concat_array_empty_string.phpt diff --git a/Zend/tests/assign_concat_array_empty_string.phpt b/Zend/tests/assign_concat_array_empty_string.phpt new file mode 100644 index 0000000000..fcacb60675 --- /dev/null +++ b/Zend/tests/assign_concat_array_empty_string.phpt @@ -0,0 +1,13 @@ +--TEST-- +Assign concat of array and empty string +--FILE-- + +--EXPECTF-- +Notice: Array to string conversion in %s on line %d +string(5) "Array" diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index ef778ea100..45cdc1b11c 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1836,6 +1836,9 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) / } } else if (UNEXPECTED(Z_STRLEN_P(op2) == 0)) { if (EXPECTED(result != op1)) { + if (result == orig_op1) { + i_zval_ptr_dtor(result ZEND_FILE_LINE_CC); + } ZVAL_COPY(result, op1); } } else { -- 2.40.0