rpgmaker
diff --git a/‎NetJSON.Tests/SerializeTests.cs‎
Lines changed: 34 additions & 0 deletions b/‎NetJSON.Tests/SerializeTests.cs‎
Lines changed: 34 additions & 0 deletions
diff --git a/‎NetJSON/Models.cs‎
Lines changed: 14 additions & 3 deletions b/‎NetJSON/Models.cs‎
Lines changed: 14 additions & 3 deletions
diff --git a/‎NetJSON/NetJSON.cs‎
Lines changed: 36 additions & 0 deletions b/‎NetJSON/NetJSON.cs‎
Lines changed: 36 additions & 0 deletions
diff --git a/‎NetJSON/lib/net35/NetJSON.dll‎
512 Bytes b/‎NetJSON/lib/net35/NetJSON.dll‎
512 Bytes
diff --git a/‎NetJSON/lib/net35/NetJSON.xml‎
Lines changed: 5 additions & 0 deletions b/‎NetJSON/lib/net35/NetJSON.xml‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎NetJSON/lib/net40/NetJSON.XML‎
Lines changed: 5 additions & 0 deletions b/‎NetJSON/lib/net40/NetJSON.XML‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎NetJSON/lib/net40/NetJSON.dll‎
1 KB b/‎NetJSON/lib/net40/NetJSON.dll‎
1 KB
diff --git a/‎NetJSON/lib/net462/NetJSON.dll‎
512 Bytes b/‎NetJSON/lib/net462/NetJSON.dll‎
512 Bytes
diff --git a/‎NetJSON/lib/net462/NetJSON.xml‎
Lines changed: 5 additions & 0 deletions b/‎NetJSON/lib/net462/NetJSON.xml‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎NetJSON/lib/net472/NetJSON.dll‎
512 Bytes b/‎NetJSON/lib/net472/NetJSON.dll‎
512 Bytes
@@ -1577,6 +1577,27 @@ public void SerializeDeserializeStrings()
 
             Assert.AreEqual(myString, result);
         }
+
+        [TestMethod]
+        public void ShouldThrowExceptionForInvalidType()
+        {
+            //should not hangs
+            var badJson = "{  \"Id\": 31,  \"SubStruct\":  1,  \"SomeString\": \"My test string\"}";
+            MySuperStruct myStruct = null;
+            Exception ex = null;
+            try
+            {
+                myStruct = NetJSON.Deserialize<MySuperStruct>(badJson);
+            }
+            catch (Exception e)
+            {
+                ex = e;
+            }
+
+            Assert.IsNotNull(ex);
+            Assert.IsInstanceOfType(ex, typeof(NetJSONTypeMismatchException));
+            Assert.IsNull(myStruct);
+        }
     }
 
     public class UserDefinedCustomClass
@@ -1613,6 +1634,19 @@ public unsafe static UserDefinedCustomClass Deserialize(char* ptr, ref int index
         }
     }
 
+    public class MySuperStruct
+    {
+        public long Id { get; set; }
+        public MySubStruct SubStruct { get; set; }
+        public string SomeString { get; set; }
+    }
+
+    public class MySubStruct
+    {
+        public long Id { get; set; }
+        public DateTime SomeDate { get; set; }
+    }
+
     public class TestClassForCustomSerialization
     {
         public int ID { get; set; }
 
@@ -189,10 +189,21 @@ public NetJSONInvalidJSONException()
 		}
 	}
 
-	/// <summary>
-	/// Exception thrown for invalid json property attribute
+    /// <summary>
+	/// Exception thrown for invalid json string
 	/// </summary>
-	public sealed class NetJSONInvalidJSONPropertyException : Exception
+	public sealed class NetJSONTypeMismatchException : Exception
+    {
+        public NetJSONTypeMismatchException()
+            : base("Unexpected type was encountered in JSON")
+        {
+        }
+    }
+
+    /// <summary>
+    /// Exception thrown for invalid json property attribute
+    /// </summary>
+    public sealed class NetJSONInvalidJSONPropertyException : Exception
 	{
 		/// <summary>
 		/// Default constructor
 
@@ -398,6 +398,7 @@ internal static readonly Type
             _enumeratorType = typeof(IEnumerator<>),
             _genericKeyValuePairType = typeof(KeyValuePair<,>),
             _invalidJSONExceptionType = typeof(NetJSONInvalidJSONException),
+            _typeMismatchExceptionType = typeof(NetJSONTypeMismatchException),
             _serializerType = typeof(NetJSONSerializer<>),
             _expandoObjectType = typeof(ExpandoObject),
             _genericDictionaryEnumerator = typeof(Dictionary<,>.Enumerator),
@@ -550,6 +551,7 @@ internal static readonly Type
 
         static ConstructorInfo _strCtorWithPtr = _stringType.GetConstructor(new[] { typeof(char*), _intType, _intType });
         static ConstructorInfo _invalidJSONCtor = _invalidJSONExceptionType.GetConstructor(Type.EmptyTypes);
+        static ConstructorInfo _typeMismatchExceptionCtor = _typeMismatchExceptionType.GetConstructor(Type.EmptyTypes);
         static ConstructorInfo _settingsCtor = _settingsType.GetConstructor(Type.EmptyTypes);
 
         private static ConcurrentDictionary<string, object> _dictLockObjects = new ConcurrentDictionary<string, object>();
@@ -4807,6 +4809,9 @@ private static MethodInfo GenerateGetClassOrDictFor(TypeBuilder typeBuilder, Typ
 
             var countLabel = il.DefineLabel();
             var isNullObjectLabel = il.DefineLabel();
+            var isNotDictOrClass = il.DefineLabel();
+
+            var isNotDictOrClassStartChar = il.DefineLabel();
 
 
             var isDict = type.IsDictionaryType();
@@ -4974,6 +4979,37 @@ private static MethodInfo GenerateGetClassOrDictFor(TypeBuilder typeBuilder, Typ
                 il.Emit(OpCodes.Ldc_I4_0);
                 il.Emit(OpCodes.Stloc, isTag);
 
+                //if current != '{' throw exception
+                il.Emit(OpCodes.Ldc_I4_0);
+                il.Emit(OpCodes.Ldloc, count);
+                il.Emit(OpCodes.Bne_Un, isNotDictOrClass);
+
+                il.Emit(OpCodes.Ldc_I4, (int)'{');
+                il.Emit(OpCodes.Ldloc, current);
+                il.Emit(OpCodes.Beq, isNotDictOrClass);
+
+
+                // ignore whitespace and ":"
+                il.Emit(OpCodes.Ldc_I4, (int)' ');
+                il.Emit(OpCodes.Ldloc, current);
+                il.Emit(OpCodes.Beq, isNotDictOrClassStartChar);
+
+                il.Emit(OpCodes.Ldc_I4, (int)':');
+                il.Emit(OpCodes.Ldloc, current);
+                il.Emit(OpCodes.Beq, isNotDictOrClassStartChar);
+
+                il.Emit(OpCodes.Ldc_I4, (int)'n');
+                il.Emit(OpCodes.Ldloc, current);
+                il.Emit(OpCodes.Beq, isNotDictOrClassStartChar);
+
+                il.Emit(OpCodes.Newobj, _typeMismatchExceptionCtor);
+                il.Emit(OpCodes.Throw);
+
+                il.MarkLabel(isNotDictOrClassStartChar);
+
+                il.MarkLabel(isNotDictOrClass);
+
+
                 //if (count == 0 && current == 'n') {
                 //    index += 3;
                 //    return null;