zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 16:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The conditional operator could clobber a local variable if it was the result of the true expression.

Browse source
This commit is contained in:
Christoph Oelckers 2017-01-02 22:26:36 +01:00
parent 1a16f664e4
commit e7cd5ec2bb
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -208,6 +208,10 @@ ExpEmit::ExpEmit(VMFunctionBuilder *build, int type, int count)
void ExpEmit::Free(VMFunctionBuilder *build) void ExpEmit::Free(VMFunctionBuilder *build)
{ {
if (RegType == REGT_INT && RegNum == 0)
{
int a = 0;
}
if (!Fixed && !Konst && RegType <= REGT_TYPE) if (!Fixed && !Konst && RegType <= REGT_TYPE)
{ {
build->Registers[RegType].Return(RegNum, RegCount); build->Registers[RegType].Return(RegNum, RegCount);
@ -4584,8 +4588,14 @@ ExpEmit FxConditional::Emit(VMFunctionBuilder *build)
else else
{ {
// Use the register returned by the true condition as the // Use the register returned by the true condition as the
// target for the false condition. // target for the false condition, if temporary.
out = trueop; // If this is a local variable we need another register for the result.
if (trueop.Fixed)
{
out = ExpEmit(build, trueop.RegType);
build->Emit(truex->ValueType->GetMoveOp(), out.RegNum, trueop.RegNum, 0);
}
else out = trueop;
} }
} }
// Make sure to skip the false path. // Make sure to skip the false path.