From 0b00800e39c135fc2062b97e7e2ce189d4d12c92 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 May 2016 13:03:33 +0800 Subject: [PATCH] [Unity] Update basic json validity check. --- .../spine-unity/Editor/SpineEditorUtilities.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs index 41474c240..af9583d10 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs @@ -711,21 +711,26 @@ namespace Spine.Unity.Editor { try { obj = Json.Deserialize(new StringReader(asset.text)); } catch (System.Exception) { + } + if (obj == null) { Debug.LogError("Is not valid JSON"); return false; } - Dictionary root = (Dictionary)obj; + var root = obj as Dictionary; + if (root == null) { + Debug.LogError("Parser returned an incorrect type."); + return false; + } if (!root.ContainsKey("skeleton")) return false; - Dictionary skeletonInfo = (Dictionary)root["skeleton"]; - - string spineVersion = (string)skeletonInfo["spine"]; - //TODO: reject old versions +// var skeletonInfo = (Dictionary)root["skeleton"]; +// string spineVersion = (string)skeletonInfo["spine"]; + // TODO: Warn users of old version incompatibility. return true; }