shithub: duke3d

Info  •  Files  •  Log  •  Branches

64-bit: Add bounds check in weapon switching.
j is usually 0 - 11 during regular gameplay,
but is > 4 billion at one point during the
demo. On 32-bit, this doesn't segfault. The
demo now plays to completion.

--- a/Game/src/sector.c

+++ b/Game/src/sector.c

@@ -2712,7 +2712,7 @@

                     sb_snum |= 1<<19;

                     p->weapon_pos = -9;

                 }

-                else if( p->gotweapon[j] && p->curr_weapon != j ) switch(j)

+                else if(j < MAX_WEAPONS && p->gotweapon[j] && p->curr_weapon != j ) switch(j)

                 {

                     case KNEE_WEAPON:

                         addweapon( p, KNEE_WEAPON );