From 4f897b2f3c9fda157a90e684d23d47eb1e6ae47b Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Sun, 14 Mar 2004 13:14:48 +0000 Subject: [PATCH] - Fix memory leak in the following code (Dmitry): --- Zend/zend_operators.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 7ee1b1ef9f..8698df2096 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1088,6 +1088,12 @@ ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) zend_make_printable_zval(op2, &op2_copy, &use_copy2); if (use_copy1) { + /* We have created a converted copy of op1. Therefore, op1 won't become the result so + * we have to free it. + */ + if (result == op1) { + zval_dtor(op1); + } op1 = &op1_copy; } if (use_copy2) { -- 2.40.0