Fixed #94

- Fixed issue with string encoding when using quote characters


Signed-off-by: rpgmaker <[email protected]>

Author: rpgmaker

NetJSON.Tests/SerializeTests.cs

@@ -254,6 +254,23 @@ public void TestSerializeDateWithMillisecondDefaultFormatLocal() {
             var ddate = NetJSON.Deserialize<DateTime>(djson);
             Assert.IsTrue(date == ddate);
         }
+
+        [TestMethod]
+        public void TestSerializeDictionaryWithComplexDictionaryString() {
+            NetJSON.IncludeFields = true;
+            Dictionary<string, string> sub1 = new Dictionary<string, string> { { "k1", "v1\"well" }, { "k2", "v2\"alsogood" } };
+            var sub1Json = NetJSON.Serialize(sub1);
+            Dictionary<string, string> main = new Dictionary<string, string> { 
+            { "MK1", sub1Json },
+            { "MK2", sub1Json } };
+
+            //At this moment we got in dictionary 2 keys with string values. Every string value is complex and actually is the other serialized Dictionary
+            string final = NetJSON.Serialize(main);
+
+            //Trying to get main dictionary back and it fails
+            var l1 = NetJSON.Deserialize<Dictionary<string, string>>(final);
+            Assert.IsTrue(l1.Count == 2);
+        }
 
         [TestMethod]
         public void TestSerializeDateUtcNowWithMillisecondDefaultFormatUtc() {

NetJSON.Tests/bin/Release/NetJSON.dll

@@ -1570,8 +1570,8 @@ public static unsafe void EncodedJSONString(StringBuilder sb, string str) {
                                     sb.Append("\\\"");
                                 else if (quote == '\'')
                                     sb.Append("\\\'");
-                            }
-                            sb.Append(c);
+                            } else
+                                sb.Append(c);
                             break;
                     }
 

NetJSON.v12.suo

@@ -4,7 +4,7 @@
     <id>NetJSON</id> 
     <title>NetJSON</title>
     <tags>json json-serializer javascript JSON serializer binary</tags>
-    <version>1.0.15.2</version> 
+    <version>1.0.15.3</version> 
     <authors>TJ Bakre</authors>
     <description>Faster than Any Binary?</description> 
     <language>en-US</language>

NetJSON/NetJSON.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.15.2")]
-[assembly: AssemblyFileVersion("1.0.15.2")]
+[assembly: AssemblyVersion("1.0.15.3")]
+[assembly: AssemblyFileVersion("1.0.15.3")]