]> granicus.if.org Git - php/commitdiff
Fix small mistake in generator creation introduced in 9a159f37
authorBob Weinand <bobwei9@hotmail.com>
Sun, 15 Jan 2017 18:26:15 +0000 (19:26 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 15 Jan 2017 18:26:15 +0000 (19:26 +0100)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 569e1c07175195f808c311d3f1449def4f4fb0a3..563022b8d7ec2f7abcbd133cbd3f68547b6f53e0 100644 (file)
@@ -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);
index f6ebd5f297d1bdaf67fd2f3c329c0a7727bb0c85..8f28209d5395212817397dcc1aeb7160c8367ec3 100644 (file)
@@ -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);