com php-src: Fixed memory leak (forgot to release the zval): Zend/zend_vm_def.h Zend/zend_vm_execute.h

From: Date: Wed, 19 Feb 2014 10:41:50 +0000
Subject: com php-src: Fixed memory leak (forgot to release the zval): Zend/zend_vm_def.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78033@lists.php.net to get a copy of this message
Commit: 75f583de91bf6f0ee0f6e4004c9c354a8905a7e2 Author: Xinchen Hui <laruence@gmail.com> Wed, 19 Feb 2014 18:41:50 +0800 Parents: 757facf6c184093734ddfd0c2f28e84bc9f9b6ee Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=75f583de91bf6f0ee0f6e4004c9c354a8905a7e2 Log: Fixed memory leak (forgot to release the zval) Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def..h index 0a9d864..595512b 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 7505189..881fef4 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;

« previous php.cvs (#78033) next »