com php-src: Fix leaks if update_constant fails: Zend/z end_vm_def.h Zend/zend_vm_execute.h

Commit: eba5466f1009e596a311cdd4791b7c255a268c2a Author: Nikita Popov <nikic@php.net> Wed, 13 Jul 2016 23:16:55 +0200 Parents: 0bda0422af0a9a920135bf3d7b7b4784eb0df802 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eba5466f1009e596a311cdd4791b7c255a268c2a Log: Fix leaks if update_constant fails 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 ecac3c0..868e035 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4736,6 +4736,7 @@ ZEND_VM_HANDLER(64, ZEND_RECV_INIT, NUM, CONST) if (Z_OPT_CONSTANT_P(param)) { SAVE_OPLINE(); if (UNEXPECTED(zval_update_constant_ex(param, EX(func)->op_array.scope) != SUCCESS)) { + zval_ptr_dtor(param); ZVAL_UNDEF(param); HANDLE_EXCEPTION(); } @@ -7258,6 +7259,7 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST) ZVAL_COPY(&c.value, val); if (Z_OPT_CONSTANT(c.value)) { if (UNEXPECTED(zval_update_constant_ex(&c.value, EX(func)->op_array.scope) != SUCCESS)) { + zval_ptr_dtor(&c.value); FREE_OP1(); FREE_OP2(); HANDLE_EXCEPTION(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 094fb8f..a9e59eb 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2277,6 +2277,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RECV_INIT_SPEC_CONST_HANDLER(Z if (Z_OPT_CONSTANT_P(param)) { SAVE_OPLINE(); if (UNEXPECTED(zval_update_constant_ex(param, EX(func)->op_array.scope) != SUCCESS)) { + zval_ptr_dtor(param); ZVAL_UNDEF(param); HANDLE_EXCEPTION(); } @@ -6149,6 +6150,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DECLARE_CONST_SPEC_CONST_CONST ZVAL_COPY(&c.value, val); if (Z_OPT_CONSTANT(c.value)) { if (UNEXPECTED(zval_update_constant_ex(&c.value, EX(func)->op_array.scope) != SUCCESS)) { + zval_ptr_dtor(&c.value); HANDLE_EXCEPTION();