zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 23:12:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- don't run constant state indices through the runtime checker.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-05 18:15:53 +01:00
parent 1b77a8f491
commit 0851d698de
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/scripting/codegeneration/codegen.cpp
View file

@ -1431,11 +1431,29 @@ FxExpression *FxTypeCast::Resolve(FCompileContext &ctx)
delete this; delete this;
return nullptr; return nullptr;
} }
FxExpression *x = new FxRuntimeStateIndex(basex); if (basex->isConstant())
x = x->Resolve(ctx); {
basex = nullptr; int i = static_cast<FxConstant *>(basex)->GetValue().GetInt();
delete this; if (i < 0)
return x; {
ScriptPosition.Message(MSG_ERROR, "State index must be positive");
delete this;
return nullptr;
}
FxExpression *x = new FxStateByIndex(i, ScriptPosition);
x = x->Resolve(ctx);
basex = nullptr;
delete this;
return x;
}
else
{
FxExpression *x = new FxRuntimeStateIndex(basex);
x = x->Resolve(ctx);
basex = nullptr;
delete this;
return x;
}
} }
} }
else if (ValueType->IsKindOf(RUNTIME_CLASS(PClassPointer))) else if (ValueType->IsKindOf(RUNTIME_CLASS(PClassPointer)))
@ -8019,7 +8037,7 @@ FxExpression *FxStateByIndex::Resolve(FCompileContext &ctx)
ABORT(ctx.Class); ABORT(ctx.Class);
auto aclass = dyn_cast<PClassActor>(ctx.Class); auto aclass = dyn_cast<PClassActor>(ctx.Class);
// This expression type can only be used from DECORATE, so there's no need to consider the possibility of calling it from a non-actor. // This expression type can only be used from actors, for everything else it has already produced a compile error.
assert(aclass != nullptr && aclass->NumOwnedStates > 0); assert(aclass != nullptr && aclass->NumOwnedStates > 0);
if (aclass->NumOwnedStates <= index) if (aclass->NumOwnedStates <= index)