Check clothes type parameter in several cases

Thanks to Inder00#1

Author: botder

Client/mods/deathmatch/logic/CClientPlayerClothes.cpp

@@ -323,6 +323,9 @@ const SPlayerClothing* CClientPlayerClothes::GetClothing(unsigned char ucType)
 
 void CClientPlayerClothes::AddClothes(const char* szTexture, const char* szModel, unsigned char ucType, bool bAddToModel)
 {
+    if (ucType >= PLAYER_CLOTHING_SLOTS)
+        return;
+
     const SPlayerClothing* pClothing = GetClothing(szTexture, szModel, ucType);
     if (pClothing && pClothing != m_Clothes[ucType])
     {
@@ -359,6 +362,9 @@ void CClientPlayerClothes::InternalAddClothes(const SPlayerClothing* pClothing,
 
 bool CClientPlayerClothes::RemoveClothes(unsigned char ucType, bool bRemoveFromModel)
 {
+    if (ucType >= PLAYER_CLOTHING_SLOTS)
+        return false;
+
     // Do we have any set clothes on this slot?
     if (m_Clothes[ucType])
     {

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -2235,29 +2235,37 @@ bool CStaticFunctionDefinitions::SetPedMoveAnim(CClientEntity& Entity, unsigned
 
 bool CStaticFunctionDefinitions::AddPedClothes(CClientEntity& Entity, const char* szTexture, const char* szModel, unsigned char ucType)
 {
-    RUN_CHILDREN(AddPedClothes(**iter, szTexture, szModel, ucType))
-    // Is he a player?
-    if (IS_PED(&Entity))
+    if (ucType < PLAYER_CLOTHING_SLOTS)
     {
-        CClientPed& Ped = static_cast<CClientPed&>(Entity);
-        Ped.GetClothes()->AddClothes(szTexture, szModel, ucType, false);
-        Ped.RebuildModel(true);
-        return true;
+        RUN_CHILDREN(AddPedClothes(**iter, szTexture, szModel, ucType))
+
+        // Is he a player?
+        if (IS_PED(&Entity))
+        {
+            CClientPed& Ped = static_cast<CClientPed&>(Entity);
+            Ped.GetClothes()->AddClothes(szTexture, szModel, ucType, false);
+            Ped.RebuildModel(true);
+            return true;
+        }
     }
 
     return false;
 }
 
 bool CStaticFunctionDefinitions::RemovePedClothes(CClientEntity& Entity, unsigned char ucType)
 {
-    RUN_CHILDREN(RemovePedClothes(**iter, ucType))
-    // Is he a player?
-    if (IS_PED(&Entity))
+    if (ucType < PLAYER_CLOTHING_SLOTS)
     {
-        CClientPed& Ped = static_cast<CClientPed&>(Entity);
-        Ped.GetClothes()->RemoveClothes(ucType, false);
-        Ped.RebuildModel(true);
-        return true;
+        RUN_CHILDREN(RemovePedClothes(**iter, ucType))
+
+        // Is he a player?
+        if (IS_PED(&Entity))
+        {
+            CClientPed& Ped = static_cast<CClientPed&>(Entity);
+            Ped.GetClothes()->RemoveClothes(ucType, false);
+            Ped.RebuildModel(true);
+            return true;
+        }
     }
 
     return false;

Server/mods/deathmatch/logic/CPlayerClothes.cpp

@@ -308,6 +308,9 @@ const SPlayerClothing* CPlayerClothes::GetClothing(unsigned char ucType)
 
 void CPlayerClothes::AddClothes(const char* szTexture, const char* szModel, unsigned char ucType)
 {
+    if (ucType >= PLAYER_CLOTHING_SLOTS)
+        return;
+
     const SPlayerClothing* pClothing = GetClothing(szTexture, szModel, ucType);
     if (pClothing && pClothing != m_Clothes[ucType])
     {
@@ -318,6 +321,9 @@ void CPlayerClothes::AddClothes(const char* szTexture, const char* szModel, unsi
 
 bool CPlayerClothes::RemoveClothes(unsigned char ucType)
 {
+    if (ucType >= PLAYER_CLOTHING_SLOTS)
+        return false;
+
     // Do we have any set clothes on this slot?
     if (m_Clothes[ucType])
     {