Merge pull request #2053 from khdang/fix-exception-message-differences

Fix exception message differences when deserializing empty string

Author: zhenlan

src/System.Private.DataContractSerialization/src/System/Xml/XmlDictionaryReader.cs

@@ -94,10 +94,7 @@ static public XmlDictionaryReader CreateTextReader(byte[] buffer, int offset, in
 
         static public XmlDictionaryReader CreateTextReader(Stream stream, XmlDictionaryReaderQuotas quotas)
         {
-            XmlReaderSettings readerSettings = new XmlReaderSettings();
-            readerSettings.CheckCharacters = false;
-            XmlReader reader = XmlReader.Create(stream, readerSettings);
-            return XmlDictionaryReader.CreateDictionaryReader(reader);
+            return CreateTextReader(stream, null, quotas, null);
         }
 
         static public XmlDictionaryReader CreateTextReader(Stream stream, Encoding encoding,

src/System.Runtime.Serialization.Json/tests/DataContractJsonSerializer.cs

@@ -1271,6 +1271,16 @@ public static void DCJS_SerializationEvents()
         Assert.True(output.OnDeserializedMethodInvoked, "output.OnDeserializedMethodInvoked is false");
     }
 
+    [Fact]
+    public static void DCJS_DeserializeEmptyString()
+    {
+        var serializer = new DataContractJsonSerializer(typeof (object));
+        Assert.Throws<SerializationException>(() =>
+        {
+            serializer.ReadObject(new MemoryStream());
+        });
+    }
+
     private static T SerializeAndDeserialize<T>(T value, string baseline, DataContractJsonSerializerSettings settings = null, Func<DataContractJsonSerializer> serializerFactory = null)
     {
         DataContractJsonSerializer dcjs;

src/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs

@@ -1703,6 +1703,16 @@ public static void DCS_DerivedException()
         Assert.StrictEqual(value.TestProperty, actual.TestProperty);
     }
 
+    [Fact]
+    public static void DCS_DeserializeEmptyString()
+    {
+        var serializer = new DataContractSerializer(typeof (object));
+        Assert.Throws<XmlException>(() =>
+        {
+            serializer.ReadObject(new MemoryStream());
+        });
+    }
+
     private static T SerializeAndDeserialize<T>(T value, string baseline, DataContractSerializerSettings settings = null, Func<DataContractSerializer> serializerFactory = null)
     {
         DataContractSerializer dcs;