thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'papersprite-papercuts' into 'master'

Browse source 
Mitigations for software papersprite light eval crashes

See merge request KartKrew/Kart!1893
This commit is contained in:
Eidolon 2024-01-31 14:36:25 +00:00
commit f3b2b24556
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/r_things.cpp
View file

@ -2081,11 +2081,21 @@ static void R_ProjectSprite(mobj_t *thing)
if (x2 < 0)
return;
if ((range = x2 - x1) <= 0)
range = x2 - x1;
if (range < 0)
{
return;
}
range++; // fencepost problem
if (range > 32767)
{
// If the range happens to be too large for fixed_t,
// abort the draw to avoid xscale becoming negative due to arithmetic overflow.
return;
}
scalestep = ((yscale2 - yscale)/range);
if (scalestep == 0)
@ -2528,8 +2538,8 @@ static void R_ProjectSprite(mobj_t *thing)
// diminished light
lindex = FixedMul(xscale, LIGHTRESOLUTIONFIX)>>(LIGHTSCALESHIFT);
if (lindex >= MAXLIGHTSCALE)
lindex = MAXLIGHTSCALE-1;
// Mitigate against negative xscale and arithmetic overflow
lindex = std::clamp(lindex, 0, MAXLIGHTSCALE - 1);
if (vis->cut & SC_SEMIBRIGHT)
lindex = (MAXLIGHTSCALE/2) + (lindex >> 1);