From e0176ff0e9ccae107c260f97747e3d2e00f985a8 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Mon, 10 May 2021 09:20:13 -0700
Subject: [PATCH] Added server JSON exception handling.

---
 MeshCentralServer.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/MeshCentralServer.cs b/MeshCentralServer.cs
index 169a69d..b983202 100644
--- a/MeshCentralServer.cs
+++ b/MeshCentralServer.cs
@@ -194,7 +194,18 @@ namespace MeshCentralRouter
 
             // Parse the received JSON
             Dictionary<string, object> jsonAction = new Dictionary<string, object>();
-            jsonAction = new JavaScriptSerializer().Deserialize<Dictionary<string, object>>(data);
+            try
+            {
+                jsonAction = new JavaScriptSerializer().Deserialize<Dictionary<string, object>>(data);
+            } catch (Exception ex) {
+                if (debug) {
+                    try {
+                        File.AppendAllText("debug.log", "processServerData JSON Deserialize error: \r\n" + ex.ToString());
+                        File.AppendAllText("debug.log", "Invalid data (" + data.Length + "): \r\n" + data);
+                    } catch (Exception) { }
+                }
+                return;
+            }
             if (jsonAction == null || jsonAction["action"].GetType() != typeof(string)) return;
 
             string action = jsonAction["action"].ToString();