Merge pull request #372 from dixon/master

Control chars should be escaped in JSON

Author: mythz

src/ServiceStack.Text/Json/JsonUtils.cs

@@ -84,7 +84,8 @@ public static void WriteString(TextWriter writer, string value)
                     continue;
                 }
 
-                if (JsConfig.EscapeUnicode)
+                // http://json.org/ spec requires any control char to be escaped
+                if (JsConfig.EscapeUnicode || char.IsControl(value[i]))
                 {
                     // Default, turn into a \uXXXX sequence
                     IntToHex(value[i], hexSeqBuffer);

tests/ServiceStack.Text.Tests/JsonTests/EscapedCharsTests.cs

@@ -252,7 +252,16 @@ public void Can_deserialize_unicode_with_escape()
             Assert.That(fromJson.Name, Is.EqualTo("JříАбвĀašū"));
         }
 
+        [Test]
+        public void Can_serialize_array_of_control_chars_and_unicode()
+        {
+            // we want to ensure control chars are escaped, but other unicode is fine to be serialized
+            Assert.IsFalse(JsConfig.EscapeUnicode, "for this test, JsConfig.EscapeUnicode must be false");
 
+            var array = new[] { ((char)0x18).ToString(), "Ω" };
+            var json = JsonSerializer.SerializeToString(array);
+            Assert.That(json, Is.EqualTo(@"[""\u0018"",""Ω""]"));
+        }
 
         public class Model
         {