From: Nikita Popov <nikic@php.net>
Date: Sat, 20 Jun 2015 17:09:07 +0000 (+0200)
Subject: Load/restore VM stack before unfinished generator cleanup
X-Git-Tag: php-7.0.0alpha2~2^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f58ebb36094e6c59d4e87bfba2a0504858adbec9;p=php

Load/restore VM stack before unfinished generator cleanup
---

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index fea3a2f50e..6a04ebd123 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -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;
+	}
 }
 /* }}} */