zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Return early from A_IncurDamage() if actor[].picnum ("htpicnum" in CON) is < 0.

Browse source 
With this change, it is impossible for negative values to be used as array
indices inside this function, and I believe that it is also impossible that
they escape to somewhere they might be used as such.

For Lunatic, allow setting actor[].picnum to negative values and in the
translator, add (commented out) code to warn whenever it is set to a constant
negative value.  Also, fix a _sound call in _addphealth in control.lua.

git-svn-id: https://svn.eduke32.com/eduke32@3626 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-03-29 15:59:23 +00:00
parent 6c624a6221
commit 53f6d749df
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/source/actors.c
View file

@ -889,7 +889,8 @@ int32_t A_IncurDamage(int32_t sn)
spritetype *const targ = &sprite[sn]; spritetype *const targ = &sprite[sn];
actor_t *const dmg = &actor[sn]; actor_t *const dmg = &actor[sn];
if (dmg->extra < 0 || targ->extra < 0) // dmg->picnum check: safety, since it might have been set to <0 from CON.
if (dmg->extra < 0 || targ->extra < 0 || dmg->picnum < 0)
{ {
dmg->extra = -1; dmg->extra = -1;
return -1; return -1;
@ -1913,7 +1914,7 @@ ACTOR_STATIC void G_MoveStandables(void)
if (s->picnum == FIREEXT) if (s->picnum == FIREEXT)
{ {
if (A_IncurDamage(i) == -1) if (A_IncurDamage(i) < 0)
goto BOLT; goto BOLT;
for (k=0; k<16; k++) for (k=0; k<16; k++)

2
polymer/eduke32/source/lunatic/control.lua
View file

@ -1014,7 +1014,7 @@ function _addphealth(ps, aci, hlthadd)
local qmaxhlth = bit.rshift(ps.max_player_health, 2) local qmaxhlth = bit.rshift(ps.max_player_health, 2)
if (j-hlthadd < qmaxhlth and j >= qmaxhlth) then if (j-hlthadd < qmaxhlth and j >= qmaxhlth) then
-- XXX: DUKE_GOTHEALTHATLOW -- XXX: DUKE_GOTHEALTHATLOW
_sound(229, aci) _sound(aci, 229)
end end
ps.last_extra = j ps.last_extra = j

4
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -917,7 +917,9 @@ local actor_mt = {
end, end,
set_picnum = function(a, picnum) set_picnum = function(a, picnum)
check_tile_idx(picnum) if (picnum >= 0) then
check_tile_idx(picnum)
end
ffi.cast(actor_ptr_ct, a).picnum = picnum ffi.cast(actor_ptr_ct, a).picnum = picnum
end, end,

6
polymer/eduke32/source/lunatic/lunacon.lua
View file

@ -1596,6 +1596,12 @@ end
local function SetStructCmd(accessfunc, pattern) local function SetStructCmd(accessfunc, pattern)
local function capfunc(idx, memb, var) local function capfunc(idx, memb, var)
local membercode, ismethod = accessfunc(true, idx, memb) local membercode, ismethod = accessfunc(true, idx, memb)
--[[
local member = memb[1]:lower()
if (type(var)=="number" and var<0 and member:match("picnum")) then
warnprintf("member '.%s' is set to a negative value", member)
end
--]]
if (ismethod) then if (ismethod) then
-- METHOD_MEMBER syntax -- METHOD_MEMBER syntax