Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add player validation for menu_display (#671)

Browse Source 
Invalid player triggered crash because get/set_pdata is unsafe
This commit is contained in:
voed 2019-01-30 16:19:30 +02:00 committed by Vincent Herbet
parent ba083deb1e
commit 5947926a09
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
amxmodx/newmenus.cpp
View File

@ -844,8 +844,21 @@ static cell AMX_NATIVE_CALL menu_display(AMX *amx, cell *params)
int player = params[1]; int player = params[1];
int page = params[3]; int page = params[3];
if (player < 1 || player > gpGlobals->maxClients)
{
LogError(amx, AMX_ERR_NATIVE, "Invalid player id %d.", player);
return 0;
}
CPlayer* pPlayer = GET_PLAYER_POINTER_I(player); CPlayer* pPlayer = GET_PLAYER_POINTER_I(player);
if (!pPlayer->ingame)
{
LogError(amx, AMX_ERR_NATIVE, "Player %d is not in game.", player);
return 0;
}
if (!CloseNewMenus(pPlayer)) if (!CloseNewMenus(pPlayer))
{ {
LogError(amx, AMX_ERR_NATIVE, "Plugin called menu_display when item=MENU_EXIT"); LogError(amx, AMX_ERR_NATIVE, "Plugin called menu_display when item=MENU_EXIT");