zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON: factor out addammo/addweapon{,var} common code, harden addweaponvar...

Browse source 
... against invalid weapon indices and arguments accessed from arrays/structs.

git-svn-id: https://svn.eduke32.com/eduke32@2873 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-10 19:11:47 +00:00
parent 26df580dac
commit 5084d08249
1 changed files with 66 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
polymer/eduke32/source/gameexec.c
View file

@ -739,6 +739,45 @@ dead:
else vm.g_sp->shade += (sector[vm.g_sp->sectnum].floorshade-vm.g_sp->shade)>>1; else vm.g_sp->shade += (sector[vm.g_sp->sectnum].floorshade-vm.g_sp->shade)>>1;
} }
void addweapon_maybeswitch(DukePlayer_t *ps, int32_t weap)
{
if (!(ps->weaponswitch & 1))
P_AddWeaponNoSwitch(ps, weap);
else
P_AddWeapon(ps, weap);
}
void addweapon_addammo_common(DukePlayer_t *ps, int32_t weap, int32_t amount)
{
P_AddAmmo(weap, ps, amount);
if (ps->curr_weapon == KNEE_WEAPON && (ps->gotweapon & (1 << weap)))
addweapon_maybeswitch(ps, weap);
}
static int32_t VM_AddWeapon(int32_t weap, int32_t amount, DukePlayer_t *ps)
{
if ((unsigned)weap >= MAX_WEAPONS)
{
OSD_Printf(CON_ERROR "Invalid weapon ID %d\n",g_errorLineNum,keyw[g_tw], weap);
return 1;
}
if ((ps->gotweapon & (1 << weap)) == 0)
{
addweapon_maybeswitch(ps, weap);
}
else if (ps->ammo_amount[weap] >= ps->max_ammo_amount[weap])
{
vm.g_flags |= VM_NOEXECUTE;
return 2;
}
addweapon_addammo_common(ps, weap, amount);
return 0;
}
GAMEEXEC_STATIC void VM_Execute(int32_t loop) GAMEEXEC_STATIC void VM_Execute(int32_t loop)
{ {
register int32_t tw = *insptr; register int32_t tw = *insptr;
@ -1319,27 +1358,29 @@ skip_check:
case CON_RIGHTBRACE: case CON_RIGHTBRACE:
insptr++; insptr++;
return; return;
case CON_ADDAMMO: case CON_ADDAMMO:
if (((unsigned)*(++insptr) >= MAX_WEAPONS)) insptr++;
{ {
OSD_Printf(CON_ERROR "Invalid weapon ID %d\n",g_errorLineNum,keyw[g_tw],(int32_t)*insptr); int32_t weap=*insptr++, amount=*insptr++;
insptr += 2; DukePlayer_t *ps = g_player[vm.g_p].ps;
break;
if ((unsigned)weap >= MAX_WEAPONS)
{
OSD_Printf(CON_ERROR "Invalid weapon ID %d\n",g_errorLineNum,keyw[g_tw], weap);
break;
}
if (ps->ammo_amount[weap] >= ps->max_ammo_amount[weap])
{
vm.g_flags |= VM_NOEXECUTE;
break;
}
addweapon_addammo_common(ps, weap, amount);
continue;
} }
if (g_player[vm.g_p].ps->ammo_amount[*insptr] >= g_player[vm.g_p].ps->max_ammo_amount[*insptr])
{
vm.g_flags |= VM_NOEXECUTE;
break;
}
P_AddAmmo(*insptr, g_player[vm.g_p].ps, *(insptr+1));
if (g_player[vm.g_p].ps->curr_weapon == KNEE_WEAPON && g_player[vm.g_p].ps->gotweapon & (1 << *insptr))
{
if (!(g_player[vm.g_p].ps->weaponswitch & 1))
P_AddWeaponNoSwitch(g_player[vm.g_p].ps, *insptr);
else P_AddWeapon(g_player[vm.g_p].ps, *insptr);
}
insptr += 2;
continue;
case CON_MONEY: case CON_MONEY:
insptr++; insptr++;
@ -1378,30 +1419,13 @@ skip_check:
continue; continue;
case CON_ADDWEAPON: case CON_ADDWEAPON:
if (((unsigned)*(++insptr) >= MAX_WEAPONS)) insptr++;
{ {
OSD_Printf(CON_ERROR "Invalid weapon ID %d\n",g_errorLineNum,keyw[g_tw],(int32_t)*insptr); int32_t weap=*insptr++, amount=*insptr++;
insptr += 2; VM_AddWeapon(weap, amount, g_player[vm.g_p].ps);
continue; continue;
} }
if ((g_player[vm.g_p].ps->gotweapon & (1 << *insptr)) == 0)
{
if (!(g_player[vm.g_p].ps->weaponswitch & 1)) P_AddWeaponNoSwitch(g_player[vm.g_p].ps, *insptr);
else P_AddWeapon(g_player[vm.g_p].ps, *insptr);
}
else if (g_player[vm.g_p].ps->ammo_amount[*insptr] >= g_player[vm.g_p].ps->max_ammo_amount[*insptr])
{
vm.g_flags |= VM_NOEXECUTE;
continue;
}
P_AddAmmo(*insptr, g_player[vm.g_p].ps, *(insptr+1));
if (g_player[vm.g_p].ps->curr_weapon == KNEE_WEAPON && g_player[vm.g_p].ps->gotweapon & (1 << *insptr))
{
if (!(g_player[vm.g_p].ps->weaponswitch & 1)) P_AddWeaponNoSwitch(g_player[vm.g_p].ps, *insptr);
else P_AddWeapon(g_player[vm.g_p].ps, *insptr);
}
insptr += 2;
continue;
case CON_DEBUG: case CON_DEBUG:
insptr++; insptr++;
@ -1500,24 +1524,11 @@ skip_check:
case CON_ADDWEAPONVAR: case CON_ADDWEAPONVAR:
insptr++; insptr++;
if ((g_player[vm.g_p].ps->gotweapon & (1 << Gv_GetVarX(*(insptr)))) == 0)
{ {
if (!(g_player[vm.g_p].ps->weaponswitch & 1)) P_AddWeaponNoSwitch(g_player[vm.g_p].ps, Gv_GetVarX(*(insptr))); int32_t weap=Gv_GetVarX(*insptr++), amount=Gv_GetVarX(*insptr++);
else P_AddWeapon(g_player[vm.g_p].ps, Gv_GetVarX(*(insptr))); VM_AddWeapon(weap, amount, g_player[vm.g_p].ps);
}
else if (g_player[vm.g_p].ps->ammo_amount[Gv_GetVarX(*(insptr))] >= g_player[vm.g_p].ps->max_ammo_amount[Gv_GetVarX(*(insptr))])
{
vm.g_flags |= VM_NOEXECUTE;
continue; continue;
} }
P_AddAmmo(Gv_GetVarX(*(insptr)), g_player[vm.g_p].ps, Gv_GetVarX(*(insptr+1)));
if (g_player[vm.g_p].ps->curr_weapon == KNEE_WEAPON && (g_player[vm.g_p].ps->gotweapon & (1 << Gv_GetVarX(*(insptr)))))
{
if (!(g_player[vm.g_p].ps->weaponswitch & 1)) P_AddWeaponNoSwitch(g_player[vm.g_p].ps, Gv_GetVarX(*(insptr)));
else P_AddWeapon(g_player[vm.g_p].ps, Gv_GetVarX(*(insptr)));
}
insptr += 2;
continue;
case CON_ACTIVATEBYSECTOR: case CON_ACTIVATEBYSECTOR:
case CON_OPERATESECTORS: case CON_OPERATESECTORS:
@ -4564,7 +4575,7 @@ nullquote:
insptr++; insptr++;
{ {
int32_t j = Gv_GetVarX(*insptr++); int32_t j = Gv_GetVarX(*insptr++);
int32_t l = Gv_GetVarX(*insptr++); int32_t l = Gv_GetVarX(*insptr++);
insptr--; insptr--;
VM_CONDITIONAL(j || l); VM_CONDITIONAL(j || l);
} }