From c2e020319534cc294ddc0e8bd295fc20d21fdc92 Mon Sep 17 00:00:00 2001
From: Peter Hartley <peter@electricimp.com>
Date: Sun, 24 Jan 2016 01:03:08 +0800
Subject: [PATCH] Fix for throwing exception from resumed generator

---
 squirrel/sqobject.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/squirrel/sqobject.cpp b/squirrel/sqobject.cpp
index 753ae50..ecd7728 100644
--- a/squirrel/sqobject.cpp
+++ b/squirrel/sqobject.cpp
@@ -153,6 +153,10 @@ bool SQGenerator::Yield(SQVM *v,SQInteger target)
 	for(SQInteger i=0;i<_ci._etraps;i++) {
 		_etraps.push_back(v->_etraps.top());
 		v->_etraps.pop_back();
+		// store relative stack base and size in case of resume to other _top
+		SQExceptionTrap &et = _etraps.back();
+		et._stackbase -= v->_stackbase;
+		et._stacksize -= v->_stackbase;
 	}
 	_state=eSuspended;
 	return true;
@@ -165,6 +169,7 @@ bool SQGenerator::Resume(SQVM *v,SQObjectPtr &dest)
 	SQInteger size = _stack.size();
 	SQInteger target = &dest - &(v->_stack._vals[v->_stackbase]);
 	assert(target>=0 && target<=255);
+	SQInteger newbase = v->_top;
 	if(!v->EnterFrame(v->_top, v->_top + size, false)) 
 		return false;
 	v->ci->_generator   = this;
@@ -180,6 +185,10 @@ bool SQGenerator::Resume(SQVM *v,SQObjectPtr &dest)
 	for(SQInteger i=0;i<_ci._etraps;i++) {
 		v->_etraps.push_back(_etraps.top());
 		_etraps.pop_back();
+		SQExceptionTrap &et = v->_etraps.back();
+		// restore absolute stack base and size
+		et._stackbase += newbase;
+		et._stacksize += newbase;
 	}
 	SQObject _this = _stack._vals[0];
 	v->_stack[v->_stackbase] = type(_this) == OT_WEAKREF ? _weakref(_this)->_obj : _this;