From afc7f576f77d053f991587dfc2b199b10b19575f Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 12 Sep 2009 20:31:41 +0000 Subject: (svn r17515) -Fix [FS#3189]: [Squirrel] In some cases the call stack would not be cleaned up properly during crash handling. Occasionally this causes asserts to be triggered or crashes. --- src/3rdparty/squirrel/squirrel/sqvm.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/3rdparty/squirrel') diff --git a/src/3rdparty/squirrel/squirrel/sqvm.cpp b/src/3rdparty/squirrel/squirrel/sqvm.cpp index 720f21297..4a0abc525 100644 --- a/src/3rdparty/squirrel/squirrel/sqvm.cpp +++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp @@ -1165,6 +1165,8 @@ bool SQVM::CallNative(SQNativeClosure *nclosure,SQInteger nargs,SQInteger stackb } + /* Store the call stack size, so we can restore that */ + SQInteger cstksize = _callsstacksize; SQInteger ret; try { SQBool can_suspend = this->_can_suspend; @@ -1175,6 +1177,7 @@ bool SQVM::CallNative(SQNativeClosure *nclosure,SQInteger nargs,SQInteger stackb _nnativecalls--; suspend = false; + _callsstacksize = cstksize; _stackbase = oldstackbase; _top = oldtop; @@ -1184,6 +1187,8 @@ bool SQVM::CallNative(SQNativeClosure *nclosure,SQInteger nargs,SQInteger stackb throw; } + assert(cstksize == _callsstacksize); + _nnativecalls--; suspend = false; if( ret == SQ_SUSPEND_FLAG) suspend = true; -- cgit v1.2.3-70-g09d2