Fix issue parsing json strings with whitespace after colon characters

mtschoen · Feb 2, 2022 · 6418374 · 6418374
1 parent a0c2d75
commit 6418374
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/Editor/JSONObjectAsyncTests.cs b/Editor/JSONObjectAsyncTests.cs
@@ -80,6 +80,12 @@ public void InputMatchesOutput(string jsonString) {
 			ValidateJsonString(jsonString, jsonString);
 		}
 
+		[Test]
+		public void InputWithExtraWhitespace() {
+			var expected = TestStrings.JsonExtraWhitespace.Replace(" ", string.Empty);
+			ValidateJsonString(TestStrings.JsonExtraWhitespace, expected);
+		}
+
 		[Test]
 		public void SubStringInputMatchesOutput() {
 			var start = 14;

diff --git a/Editor/JSONObjectTestStrings.cs b/Editor/JSONObjectTestStrings.cs
@@ -30,5 +30,6 @@ static class JSONObjectTestStrings {
 		public const string JsonFormat = "{{\"" + FieldName + "\":{0}}}";
 		public const string JsonFormatString = "{{\"" + FieldName + "\":\"{0}\"}}";
 		public const string JsonFormatFloat = "{{\"" + FieldName + "\":{0}}}";
+		public const string JsonExtraWhitespace = "{\"key1\":\"value\", \"key2\" : \"value\" }";
 	}
 }
diff --git a/Editor/JSONObjectTests.cs b/Editor/JSONObjectTests.cs
@@ -63,6 +63,12 @@ public void InputMatchesOutput(string jsonString) {
 			ValidateJsonString(jsonString);
 		}
 
+		[Test]
+		public void InputWithExtraWhitespace() {
+			var expected = TestStrings.JsonExtraWhitespace.Replace(" ", string.Empty);
+			ValidateJsonObject(JSONObject.Create(TestStrings.JsonExtraWhitespace), expected);
+		}
+
 		[Test]
 		public void PrettyInputMatchesPrettyOutput() {
 			ValidateJsonString(TestStrings.PrettyJsonString, true);

diff --git a/JSONObject.cs b/JSONObject.cs
@@ -729,6 +729,14 @@ static void SafeAddChild(JSONObject container, JSONObject child) {
 
 		void ParseValue(string inputString, int startOffset, int lastValidOffset) {
 			var firstCharacter = inputString[startOffset];
+			do {
+				if (Array.IndexOf(Whitespace, firstCharacter) > -1) {
+					firstCharacter = inputString[++startOffset];
+					continue;
+				}
+
+				break;
+			} while (true);
 
 			// Use character comparison instead of string compare as performance optimization
 			switch (firstCharacter)