Changeset 21827 for ps

Timestamp:

05/27/18 15:47:18 (7 years ago)

Author:

elexis

Message:

Prevent the lobby gamelist from breaking entirely if a gamestanza contains an empty or invalid mod version JSON string (refs rP21301).

Catch all JSON SyntaxError exceptions in JS (refs rP18534).
The C++ ParseJSON function already catches exceptions and the resulting errors can't trigger a denial of service.

Differential Revision: ​https://code.wildfiregames.com/D1479
Based on patch by: Imarok
Reviewed by: Imarok
Comments By: Itms

Location:

ps/trunk/binaries/data/mods/public/gui

Files:

• common/functions_utility.js (modified) (2 diffs)
• lobby/lobby.js (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/gui/common/functions_utility.js

@@ -88 +88 @@
 function stringifiedTeamListToPlayerData(stringifiedTeamList)
 {
-    let teamList = JSON.parse(unescapeText(stringifiedTeamList));
+    let teamList = {};
+    try
+    {
+        teamList = JSON.parse(unescapeText(stringifiedTeamList));
+    }
+    catch (e) {}
+
     let playerData = [];
 
@@ -172 +178 @@
     Engine.GetGUIObjectByName("chatText").caption = "";
 
-    try {
+    try
+    {
         for (let timer of g_ChatTimers)
             clearTimeout(timer);
         g_ChatTimers.length = 0;
-    } catch (e) {
-    }
+    }
+    catch (e) {}
 }
 

ps/trunk/binaries/data/mods/public/gui/lobby/lobby.js

@@ -1018 +1018 @@
                 g_DefaultLobbyRating;
 
-        if (!hasSameMods(JSON.parse(game.mods), Engine.GetEngineInfo().mods))
+        try
+        {
+            game.mods = JSON.parse(game.mods);
+        }
+        catch (e)
+        {
+            game.mods = [];
+        }
+
+        if (!hasSameMods(game.mods, Engine.GetEngineInfo().mods))
             game.state = "incompatible";
 
@@ -1179 +1188 @@
             400, 200,
             translate("Your active mods do not match the mods of this game.") + "\n\n" +
-                comparedModsString(JSON.parse(game.mods), Engine.GetEngineInfo().mods) + "\n\n" +
+                comparedModsString(game.mods, Engine.GetEngineInfo().mods) + "\n\n" +
                 translate("Do you want to switch to the mod selection page?"),
             translate("Incompatible mods"),