From c4c67e591bbe3cb55d6f282a9267b913c9e3f841 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Mon, 26 Oct 2015 19:02:19 -0700
Subject: [PATCH] add error handling for JSON serialization

---
 windows/WinUI/APIHandler.cs | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/windows/WinUI/APIHandler.cs b/windows/WinUI/APIHandler.cs
index 0755c28d4..8e7408a54 100644
--- a/windows/WinUI/APIHandler.cs
+++ b/windows/WinUI/APIHandler.cs
@@ -41,7 +41,15 @@ namespace WinUI
             {
                 var responseText = streamReader.ReadToEnd();
 
-                ZeroTierStatus status = JsonConvert.DeserializeObject<ZeroTierStatus>(responseText);
+                ZeroTierStatus status = null;
+                try
+                {
+                    status = JsonConvert.DeserializeObject<ZeroTierStatus>(responseText);
+                }
+                catch (JsonReaderException e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
                 return status;
             }
         }
@@ -61,9 +69,16 @@ namespace WinUI
             using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
             {
                 var responseText = streamReader.ReadToEnd();
-                Console.WriteLine(responseText);
 
-                List<ZeroTierNetwork> networkList = JsonConvert.DeserializeObject<List<ZeroTierNetwork>>(responseText);
+                List<ZeroTierNetwork> networkList = null;
+                try
+                {
+                    networkList = JsonConvert.DeserializeObject<List<ZeroTierNetwork>>(responseText);
+                }
+                catch (JsonReaderException e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
                 return networkList;
             }
         }
@@ -119,9 +134,16 @@ namespace WinUI
             using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
             {
                 var responseText = streamReader.ReadToEnd();
-                Console.WriteLine(responseText);
 
-                List<ZeroTierPeer> peerList = JsonConvert.DeserializeObject<List<ZeroTierPeer>>(responseText);
+                List<ZeroTierPeer> peerList = null;
+                try
+                {
+                    peerList = JsonConvert.DeserializeObject<List<ZeroTierPeer>>(responseText);
+                }
+                catch (JsonReaderException e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
                 return peerList;
             }
         }