com php-src: Fix small mistake in generator creation introduced in 9a159f37: Zend/zend_vm_def.h Zend/zend_vm_execute .h

From: Date: Sun, 15 Jan 2017 18:26:15 +0000
Subject: com php-src: Fix small mistake in generator creation introduced in 9a159f37: Zend/zend_vm_def.h Zend/zend_vm_execute .h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-96734@lists.php.net to get a copy of this message
Commit: 9e3c35b6d16c8e6b54567e952834a0d817c97f88 Author: Bob Weinand <bobwei9@hotmail.com> Sun, 15 Jan 2017 19:26:15 +0100 Parents: ca4cfcc631cfc8a91dacc4a830f63e589ae4ba47 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e3c35b6d16c8e6b54567e952834a0d817c97f88 Log: Fix small mistake in generator creation introduced in 9a159f37 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 569e1c0..563022b 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3962,7 +3962,7 @@ ZEND_VM_HANDLER(41, ZEND_GENERATOR_CREATE, ANY, ANY) * is allocated on heap. */ num_args = EX_NUM_ARGS(); - if (EXPECTED(num_args <= EX(func)->op_array.last_var)) { + if (EXPECTED(num_args <= EX(func)->op_array.num_args)) { used_stack = (ZEND_CALL_FRAME_SLOT + EX(func)->op_array.last_var + EX(func)->op_array.T) * sizeof(zval); gen_execute_data = (zend_execute_data*)emalloc(used_stack); used_stack = (ZEND_CALL_FRAME_SLOT + EX(func)->op_array.last_var) * sizeof(zval); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index f6ebd5f..8f28209 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1159,7 +1159,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GENERATOR_CREATE_SPEC_HANDLER( * is allocated on heap. */ num_args = EX_NUM_ARGS(); - if (EXPECTED(num_args <= EX(func)->op_array.last_var)) { + if (EXPECTED(num_args <= EX(func)->op_array.num_args)) { used_stack = (ZEND_CALL_FRAME_SLOT + EX(func)->op_array.last_var + EX(func)->op_array.T) * sizeof(zval); gen_execute_data = (zend_execute_data*)emalloc(used_stack); used_stack = (ZEND_CALL_FRAME_SLOT + EX(func)->op_array.last_var) * sizeof(zval);

« previous php.cvs (#96734) next »