com php-src: Fix leak when generator return value is not used: Zend/zend_vm_def.h Zend/zend_vm_execute.h

Commit: 439a95908bb95148c943d340dd6b538f6261ef9e Author: Nikita Popov <nikic@php.net> Sat, 5 Jul 2014 15:07:25 +0200 Parents: 2d4c962c61e03e453b4ac3821278665b26bcd68c Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=439a95908bb95148c943d340dd6b538f6261ef9e Log: Fix leak when generator return value is not used 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 4a73900..50f0e53 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2690,6 +2690,8 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (RETURN_VALUE_USED(opline)) { zend_generator_create_zval(&fbc->op_array, EX_VAR(opline->result.var) TSRMLS_CC); + } else { + zend_vm_stack_free_args(call TSRMLS_CC); } EX(call) = call->prev_nested_call; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 6130589..31f1b9d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -642,6 +642,8 @@ static int ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (RETURN_VALUE_USED(opline)) { zend_generator_create_zval(&fbc->op_array, EX_VAR(opline->result.var) TSRMLS_CC); + } else { + zend_vm_stack_free_args(call TSRMLS_CC); } EX(call) = call->prev_nested_call;