jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hexen: Add bounds checking for world variables.

Browse source 
There is a fixed number of world variables and the limit should not
be exceeded.
This commit is contained in:
Simon Howard 2018-01-05 01:27:11 +01:00
parent 005a79c652
commit 118d869f5b
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/hexen/p_acs.c
View file

@ -900,6 +900,15 @@ static int ReadMapVar(void)
return var;
}
static int ReadWorldVar(void)
{
int var = ReadCodeImmediate();
ACSAssert(var >= 0, "negative world variable: %d < 0", var);
ACSAssert(var < MAX_ACS_WORLD_VARS,
"invalid world variable: %d >= %d", var, MAX_ACS_WORLD_VARS);
return var;
}
//==========================================================================
//
// P-Code Commands
@ -1185,8 +1194,7 @@ static int CmdAssignMapVar(void)
static int CmdAssignWorldVar(void)
{
WorldVars[LONG(*PCodePtr)] = Pop();
++PCodePtr;
WorldVars[ReadWorldVar()] = Pop();
return SCRIPT_CONTINUE;
}
@ -1204,8 +1212,7 @@ static int CmdPushMapVar(void)
static int CmdPushWorldVar(void)
{
Push(WorldVars[LONG(*PCodePtr)]);
++PCodePtr;
Push(WorldVars[ReadWorldVar()]);
return SCRIPT_CONTINUE;
}
@ -1223,8 +1230,7 @@ static int CmdAddMapVar(void)
static int CmdAddWorldVar(void)
{
WorldVars[LONG(*PCodePtr)] += Pop();
++PCodePtr;
WorldVars[ReadWorldVar()] += Pop();
return SCRIPT_CONTINUE;
}
@ -1242,8 +1248,7 @@ static int CmdSubMapVar(void)
static int CmdSubWorldVar(void)
{
WorldVars[LONG(*PCodePtr)] -= Pop();
++PCodePtr;
WorldVars[ReadWorldVar()] -= Pop();
return SCRIPT_CONTINUE;
}
@ -1261,8 +1266,7 @@ static int CmdMulMapVar(void)
static int CmdMulWorldVar(void)
{
WorldVars[LONG(*PCodePtr)] *= Pop();
++PCodePtr;
WorldVars[ReadWorldVar()] *= Pop();
return SCRIPT_CONTINUE;
}
@ -1280,8 +1284,7 @@ static int CmdDivMapVar(void)
static int CmdDivWorldVar(void)
{
WorldVars[LONG(*PCodePtr)] /= Pop();
++PCodePtr;
WorldVars[ReadWorldVar()] /= Pop();
return SCRIPT_CONTINUE;
}
@ -1299,8 +1302,7 @@ static int CmdModMapVar(void)
static int CmdModWorldVar(void)
{
WorldVars[LONG(*PCodePtr)] %= Pop();
++PCodePtr;
WorldVars[ReadWorldVar()] %= Pop();
return SCRIPT_CONTINUE;
}
@ -1318,8 +1320,7 @@ static int CmdIncMapVar(void)
static int CmdIncWorldVar(void)
{
++WorldVars[LONG(*PCodePtr)];
++PCodePtr;
++WorldVars[ReadWorldVar()];
return SCRIPT_CONTINUE;
}
@ -1337,8 +1338,7 @@ static int CmdDecMapVar(void)
static int CmdDecWorldVar(void)
{
--WorldVars[LONG(*PCodePtr)];
++PCodePtr;
--WorldVars[ReadWorldVar()];
return SCRIPT_CONTINUE;
}