Validate weapon list entries in CWeapons::findWeapon

This appears to fix the issue where the server would crash when using GiveBotsWeapons or similar plugins.
nosoop · Aug 11, 2020 · 2bf8354 · 2bf8354
1 parent cc23351
commit 2bf8354
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/utils/RCBot2_meta/bot_weapons.cpp b/utils/RCBot2_meta/bot_weapons.cpp
@@ -292,7 +292,8 @@ edict_t *CWeapons :: findWeapon ( edict_t *pPlayer, const char *pszWeaponName )
 	{
 		pWeapon = INDEXENT(m_Weapon_iter->GetEntryIndex());
 
-		if ( strcmp(pWeapon->GetClassName(),pszWeaponName) == 0 )
+		// TODO get familiar with validity of handles / edicts
+		if (pWeapon && !pWeapon->IsFree() && strcmp(pWeapon->GetClassName(),pszWeaponName) == 0 )
 			return pWeapon;
 
 		m_Weapon_iter++;