From 75f583de91bf6f0ee0f6e4004c9c354a8905a7e2 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 19 Feb 2014 18:41:50 +0800 Subject: [PATCH] Fixed memory leak (forgot to release the zval) --- Zend/zend_vm_def.h | 5 ++--- Zend/zend_vm_execute.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 0a9d86490d..595512b4fd 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4678,9 +4678,8 @@ ZEND_VM_HANDLER(58, ZEND_END_SILENCE, TMP, ANY) } EG(error_reporting_ini_entry)->value = estrndup(Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting)); EG(error_reporting_ini_entry)->value_length = Z_STRLEN(restored_error_reporting); - } else { - zval_dtor(&restored_error_reporting); - } + } + zval_dtor(&restored_error_reporting); } //??? if (EX(old_error_reporting) == EX_VAR(opline->op1.var)) { //??? EX(old_error_reporting) = NULL; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7505189e51..881fef40ac 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -8102,9 +8102,8 @@ static int ZEND_FASTCALL ZEND_END_SILENCE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ } EG(error_reporting_ini_entry)->value = estrndup(Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting)); EG(error_reporting_ini_entry)->value_length = Z_STRLEN(restored_error_reporting); - } else { - zval_dtor(&restored_error_reporting); } + zval_dtor(&restored_error_reporting); } //??? if (EX(old_error_reporting) == EX_VAR(opline->op1.var)) { //??? EX(old_error_reporting) = NULL; -- 2.50.1