mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Load/restore VM stack before unfinished generator cleanup

Browse Source
This commit is contained in:
Nikita Popov 2015-06-20 19:09:07 +02:00
parent ffe0f470d6
commit f58ebb3609
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Zend/zend_generators.c
View File

@ -42,7 +42,23 @@ static void zend_generator_cleanup_unfinished_execution(zend_generator *generato
generator->send_target = NULL;
}
zend_cleanup_unfinished_execution(execute_data, op_num, 0);
{
/* There may be calls to zend_vm_stack_free_call_frame(), which modifies the VM stack
* globals, so need to load/restore those. */
zend_vm_stack original_stack = EG(vm_stack);
original_stack->top = EG(vm_stack_top);
EG(vm_stack_top) = generator->stack->top;
EG(vm_stack_end) = generator->stack->end;
EG(vm_stack) = generator->stack;
zend_cleanup_unfinished_execution(execute_data, op_num, 0);
generator->stack = EG(vm_stack);
generator->stack->top = EG(vm_stack_top);
EG(vm_stack_top) = original_stack->top;
EG(vm_stack_end) = original_stack->end;
EG(vm_stack) = original_stack;
}
}
/* }}} */