stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-17 01:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix buffer overflow for setcontrol with 2 arguments

Browse source
This commit is contained in:
Gustaf Alhäll 2023-04-02 21:58:42 +02:00
parent 3c81938496
commit 2e3963fd16
No known key found for this signature in database
GPG key ID: 6C1F67D690CDEDFD
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_input.c
View file

@ -993,7 +993,7 @@ static void setcontrol(INT32 (*gc)[2])
{ {
INT32 numctrl; INT32 numctrl;
const char *namectrl; const char *namectrl;
INT32 keynum, keynum1, keynum2; INT32 keynum, keynum1, keynum2 = 0;
INT32 player = ((void*)gc == (void*)&gamecontrolbis ? 1 : 0); INT32 player = ((void*)gc == (void*)&gamecontrolbis ? 1 : 0);
boolean nestedoverride = false; boolean nestedoverride = false;
@ -1009,7 +1009,8 @@ static void setcontrol(INT32 (*gc)[2])
return; return;
} }
keynum1 = G_KeyNameToNum(COM_Argv(2)); keynum1 = G_KeyNameToNum(COM_Argv(2));
keynum2 = G_KeyNameToNum(COM_Argv(3)); if (COM_Argc() > 3)
keynum2 = G_KeyNameToNum(COM_Argv(3));
keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride); keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride);
if (keynum >= 0) if (keynum >= 0)