Protect against invalid readyweapon (#1807)

fabiangreffrath · kraflab · web-flow · commit 6eb4413fb831 · 2024-07-31T14:42:41.000+02:00
Co-authored-by: kraflab &lt;kraflab@gmail.com&gt;
diff --git a/src/p_pspr.c b/src/p_pspr.c
@@ -586,7 +586,10 @@ void A_Lower(player_t *player, pspdef_t *psp)
       return;
     }
 
-  player->readyweapon = player->pendingweapon;
+  if (player->pendingweapon < NUMWEAPONS || !mbf21)
+  {
+    player->readyweapon = player->pendingweapon;
+  }
 
   P_BringUpWeapon(player);
 }

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,10 @@ void A_Lower(player_t player, pspdef_t psp)`
`586`	`586`	`return;`
`587`	`587`	`}`
`588`	`588`
`589`		`- player->readyweapon = player->pendingweapon;`
	`589`	`+ if (player->pendingweapon < NUMWEAPONS \|\| !mbf21)`
	`590`	`+ {`
	`591`	`+ player->readyweapon = player->pendingweapon;`
	`592`	`+ }`
`590`	`593`
`591`	`594`	`P_BringUpWeapon(player);`
`592`	`595`	`}`