Escape JSON strings when written to TextWriter or Stream

Author: mythz

src/ServiceStack.Text/Json/JsonWriter.Generic.cs

@@ -174,7 +174,10 @@ public static TypeInfo GetTypeInfo()
 
 		static JsonWriter()
 		{
-		    var isNumeric = typeof(T).IsNumericType();
+            if (JsonWriter.Instance == null)
+                return;
+
+            var isNumeric = typeof(T).IsNumericType();
 			TypeInfo = new TypeInfo {
                 EncodeMapKey = typeof(T) == typeof(bool) || isNumeric,
                 IsNumeric = isNumeric

src/ServiceStack.Text/JsonSerializer.cs

@@ -152,7 +152,7 @@ public static void SerializeToWriter<T>(T value, TextWriter writer)
 			if (value == null) return;
 			if (typeof(T) == typeof(string))
 			{
-				writer.Write(value);
+                JsonUtils.WriteString(writer, value as string);
 			}
             else if (typeof(T) == typeof(object))
             {
@@ -175,7 +175,7 @@ public static void SerializeToWriter(object value, Type type, TextWriter writer)
 			if (value == null) return;
 			if (type == typeof(string))
 			{
-				writer.Write(value);
+                JsonUtils.WriteString(writer, value as string);
 				return;
 			}
 

src/ServiceStack.Text/TypeSerializer.cs

@@ -151,7 +151,8 @@ public static string SerializeToString<T>(T value)
 		public static string SerializeToString(object value, Type type)
 		{
 			if (value == null) return null;
-			if (type == typeof(string)) return value as string;
+			if (type == typeof(string)) 
+                return value as string;
 
             using (var sb = StringBuilderWriter.Create())
             {

tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj

@@ -268,6 +268,7 @@
     <Compile Include="Shared\Shipper.cs" />
     <Compile Include="Shared\ShipperFactory.cs" />
     <Compile Include="Shared\TaskQueue.cs" />
+    <Compile Include="StreamTests.cs" />
     <Compile Include="StringConverterUtilsTests.cs" />
     <Compile Include="StringTests.cs" />
     <Compile Include="StructTests.cs" />

tests/ServiceStack.Text.Tests/StreamTests.cs

@@ -0,0 +1,56 @@
+using System.IO;
+using NUnit.Framework;
+
+namespace ServiceStack.Text.Tests
+{
+    [TestFixture]
+    public class StreamTests
+    {
+        [Test]
+        public void Does_escape_string_when_serializing_to_TextWriter()
+        {
+            var expected = @"String with backslashes '\', 'single' and ""double quotes"", (along		with	other	special	symbols	like	tabs) wich may broke incorrect serializing/deserializing implementation ;)";
+
+            var json = "\"String with backslashes '\\\\', 'single' and \\\"double quotes\\\", (along\\t\\twith\\tother\\tspecial\\tsymbols\\tlike\\ttabs) wich may broke incorrect serializing/deserializing implementation ;)\"";
+
+            using (var ms = new MemoryStream())
+            {
+                var sw = new StreamWriter(ms);
+                JsonSerializer.SerializeToWriter(expected, sw);
+                sw.Flush();
+
+                using (var sr = new StreamReader(ms))
+                {
+                    ms.Position = 0;
+                    var ssJson = sr.ReadToEnd();
+                    Assert.That(ssJson, Is.EqualTo(json));
+
+                    ms.Position = 0;
+                    var ssString = JsonSerializer.DeserializeFromReader(sr, typeof(string));
+                    Assert.That(ssString, Is.EqualTo(expected));
+                }
+            }
+        }
+
+        [Test]
+        public void Does_escape_string_when_serializing_to_Stream()
+        {
+            var expected = @"String with backslashes '\', 'single' and ""double quotes"", (along		with	other	special	symbols	like	tabs) wich may broke incorrect serializing/deserializing implementation ;)";
+
+            var json = "\"String with backslashes '\\\\', 'single' and \\\"double quotes\\\", (along\\t\\twith\\tother\\tspecial\\tsymbols\\tlike\\ttabs) wich may broke incorrect serializing/deserializing implementation ;)\"";
+
+            using (var ms = new MemoryStream())
+            {
+                JsonSerializer.SerializeToStream(expected, ms);
+                var ssJson = ms.ToArray().FromUtf8Bytes();
+
+                Assert.That(ssJson, Is.EqualTo(json));
+
+                ms.Position = 0;
+                var ssString = JsonSerializer.DeserializeFromStream(typeof(string), ms);
+
+                Assert.That(ssString, Is.EqualTo(expected));
+            }
+        }
+    }
+}