zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: compile-time error in vararg function call would result in a crash.

This commit is contained in:
ZZYZX 2017-01-28 01:12:42 +02:00 committed by Christoph Oelckers
parent 97ad1496b3
commit 13c6d16905
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scripting/codegeneration/codegen.cpp
View File

@ -8202,14 +8202,16 @@ FxExpression *FxVMFunctionCall::Resolve(FCompileContext& ctx)
{ {
// only cast implicit-string types for vararg, leave everything else as-is // only cast implicit-string types for vararg, leave everything else as-is
// this was outright copypasted from FxFormat // this was outright copypasted from FxFormat
ArgList[i] = ArgList[i]->Resolve(ctx); x = ArgList[i]->Resolve(ctx);
if (ArgList[i]->ValueType == TypeName || if (x)
ArgList[i]->ValueType == TypeSound) {
if (x->ValueType == TypeName ||
x->ValueType == TypeSound)
{ {
x = new FxStringCast(ArgList[i]); x = new FxStringCast(ArgList[i]);
x = x->Resolve(ctx); x = x->Resolve(ctx);
} }
else x = ArgList[i]; }
} }
else if (!(flag & (VARF_Ref|VARF_Out))) else if (!(flag & (VARF_Ref|VARF_Out)))
{ {