zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed crash on accessing state owner during VM abort

Browse source 
https://forum.zdoom.org/viewtopic.php?t=61338
This commit is contained in:
alexey.lysiuk 2018-07-19 13:38:49 +03:00
parent 7da61ddfee
commit 4d35b12808
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/info.cpp
View file

@ -154,6 +154,9 @@ bool FState::CallAction(AActor *self, AActor *stateowner, FStateParamInfo *info,
catch (CVMAbortException &err) catch (CVMAbortException &err)
{ {
err.MaybePrintMessage(); err.MaybePrintMessage();
if (stateowner != nullptr)
{
const char *callinfo = ""; const char *callinfo = "";
if (info != nullptr && info->mStateType == STATE_Psprite) if (info != nullptr && info->mStateType == STATE_Psprite)
{ {
@ -161,7 +164,8 @@ bool FState::CallAction(AActor *self, AActor *stateowner, FStateParamInfo *info,
else callinfo = "overlay "; else callinfo = "overlay ";
} }
err.stacktrace.AppendFormat("Called from %sstate %s in %s\n", callinfo, FState::StaticGetStateName(this).GetChars(), stateowner->GetClass()->TypeName.GetChars()); err.stacktrace.AppendFormat("Called from %sstate %s in %s\n", callinfo, FState::StaticGetStateName(this).GetChars(), stateowner->GetClass()->TypeName.GetChars());
throw; }
throw; throw;
} }