Fixed trailing backslash, INCR to v3.63

mythz · mythz · commit d8040ab27003 · 2012-03-18T12:04:26.000-04:00
diff --git a/NuGet/servicestack.text.nuspec b/NuGet/servicestack.text.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>ServiceStack.Text</id> 
-    <version>3.6.0</version> 
+    <version>3.6.3</version> 
     <authors>Demis Bellot</authors> 
     <owners>Demis Bellot</owners>
     <summary>.NET's fastest JSON, JSV and CSV Text Serializers (3x faster than JSON.NET)</summary>
diff --git a/src/ServiceStack.Text/Common/DeserializeDictionary.cs b/src/ServiceStack.Text/Common/DeserializeDictionary.cs
@@ -93,7 +93,7 @@ public static IDictionary<TKey, TValue> ParseDictionary<TKey, TValue>(
 
 			var to = (createMapType == null)
 				? new Dictionary<TKey, TValue>()
-				: (IDictionary<TKey, TValue>)ReflectionExtensions.CreateInstance(createMapType);
+				: (IDictionary<TKey, TValue>)createMapType.CreateInstance();
 
 			if (value == JsWriter.EmptyMap) return to;
 
diff --git a/src/ServiceStack.Text/Json/JsonTypeSerializer.cs b/src/ServiceStack.Text/Json/JsonTypeSerializer.cs
@@ -492,8 +492,13 @@ public string EatValue(string value, ref int i)
 					{
 						valueChar = value[i];
 
-						if (valueChar == JsWriter.QuoteChar
-							&& value[i - 1] != JsonUtils.EscapeChar)
+						if (valueChar == JsonUtils.EscapeChar)
+						{
+							i++;
+							continue;
+						}
+
+						if (valueChar == JsWriter.QuoteChar)
 							withinQuotes = !withinQuotes;
 
 						if (withinQuotes)
@@ -513,8 +518,13 @@ public string EatValue(string value, ref int i)
 					{
 						valueChar = value[i];
 
-						if (valueChar == JsWriter.QuoteChar
-							&& value[i - 1] != JsonUtils.EscapeChar)
+						if (valueChar == JsonUtils.EscapeChar)
+						{
+							i++;
+							continue;
+						}
+
+						if (valueChar == JsWriter.QuoteChar)
 							withinQuotes = !withinQuotes;
 
 						if (withinQuotes)
diff --git a/src/ServiceStack.Text/Properties/AssemblyInfo.cs b/src/ServiceStack.Text/Properties/AssemblyInfo.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("3.6.0.*")]
+[assembly: AssemblyVersion("3.6.3.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tests/ServiceStack.Text.Tests/ReportedIssues.cs b/tests/ServiceStack.Text.Tests/ReportedIssues.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using NUnit.Framework;
 using ServiceStack.ServiceInterface.ServiceModel;
@@ -232,5 +233,26 @@ public void Objects_Do_Not_Survive_RoundTrips_Via_StringStringDictionary_Due_To_
             Assert.AreEqual(book.Title, fromJsonViaDictionary.Title);
             Assert.AreEqual(book.CategoryId, fromJsonViaDictionary.CategoryId);
         }
+
+		public class Test
+		{
+			public IDictionary<string, string> Items { get; set; }
+			public string TestString { get; set; }
+		}
+
+		[Test]
+		public void Does_Trailing_Backslashes()
+		{
+			var test = new Test {
+				TestString = "Test",
+				Items = new Dictionary<string, string> { { "foo", "bar\\" } }
+			};
+
+			var serialized = JsonSerializer.SerializeToString(test);
+			Console.WriteLine(serialized);
+			var deserialized = JsonSerializer.DeserializeFromString<Test>(serialized);
+
+			Assert.That(deserialized.TestString, Is.EqualTo("Test")); // deserialized.TestString is NULL
+		}
 	}
 }
