Fixed client crash caused by invalid blip icon

multitheftauto · Jan 25, 2018 · 288cff1 · 288cff1
1 parent 01885cb
commit 288cff1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/Client/game_sa/CMarkerSA.cpp b/Client/game_sa/CMarkerSA.cpp
@@ -42,7 +42,10 @@ void CMarkerSA::Init ( void )
 VOID CMarkerSA::SetSprite ( eMarkerSprite Sprite = (eMarkerSprite)MARKER_SPRITE_NONE )
 {
     DEBUG_TRACE("VOID CMarkerSA::SetSprite ( eMarkerSprite Sprite = (eMarkerSprite)MARKER_SPRITE_NONE )");
-    internalInterface->nBlipSprite = Sprite;
+    if (Sprite >= MARKER_SPRITE_NONE && Sprite <= MARKER_SPRITE_SPRAY)
+    {
+        internalInterface->nBlipSprite = Sprite;
+    }
 }
 
 /**

diff --git a/Client/mods/deathmatch/logic/CClientRadarMarkerManager.h b/Client/mods/deathmatch/logic/CClientRadarMarkerManager.h
@@ -40,6 +40,7 @@ class CClientRadarMarkerManager
     inline std::list < CClientRadarMarker* > ::const_iterator   IterEnd                         ( void )                                    { return m_Markers.end (); };
 
     bool                                                        Exists                          ( CClientRadarMarker* pMarker );
+    static bool                                                 IsValidIcon                     ( unsigned long ulIcon )                    { return ulIcon <= RADAR_MARKER_LIMIT; }
 
 private:
     inline void                                             AddToList                       ( CClientRadarMarker* pMarker )             { m_Markers.push_back ( pMarker ); };

diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp
@@ -77,6 +77,11 @@ int CLuaBlipDefs::CreateBlip ( lua_State* luaVM )
     argStream.ReadNumber ( sOrdering, 0 );
     argStream.ReadNumber ( usVisibleDistance, 16383 );
 
+    if (!CClientRadarMarkerManager::IsValidIcon(ucIcon))
+    {
+        argStream.SetCustomError("Invalid icon");
+    }
+
     if ( !argStream.HasErrors () )
     {
         CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
@@ -129,7 +134,11 @@ int CLuaBlipDefs::CreateBlipAttachedTo ( lua_State* luaVM )
     argStream.ReadNumber ( sOrdering, 0 );
     argStream.ReadNumber ( usVisibleDistance, 16383 );
 
-    // Element in place?
+    if (!CClientRadarMarkerManager::IsValidIcon(ucIcon))
+    {
+        argStream.SetCustomError("Invalid icon");
+    }
+
     if ( !argStream.HasErrors () )
     {
         CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM );

diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp
@@ -85,6 +85,11 @@ int CLuaBlipDefs::CreateBlip ( lua_State* luaVM )
     else
         argStream.ReadUserData ( pVisibleTo, m_pRootElement );
 
+    if (!CBlipManager::IsValidIcon(ucIcon))
+    {
+        argStream.SetCustomError("Invalid icon");
+    }
+
     if ( !argStream.HasErrors () )
     {
         CLuaMain* pLuaMain = g_pGame->GetLuaManager ()->GetVirtualMachine ( luaVM );
@@ -140,6 +145,11 @@ int CLuaBlipDefs::CreateBlipAttachedTo ( lua_State* luaVM )
     else
         argStream.ReadUserData ( pVisibleTo, m_pRootElement );
 
+    if (!CBlipManager::IsValidIcon(ucIcon))
+    {
+        argStream.SetCustomError("Invalid icon");
+    }
+
     if ( !argStream.HasErrors () )
     {
         CResource * resource = m_pLuaManager->GetVirtualMachineResource ( luaVM );