2009-05-23 Atsushi Enomoto <atsushi@ximian.com>

	* XmlBinaryDictionaryReader.cs : fix regression on stream consumption
	  excess.

svn path=/trunk/mcs/; revision=134669

diff --git a/mcs/class/System.Runtime.Serialization/System.Xml/ChangeLog b/mcs/class/System.Runtime.Serialization/System.Xml/ChangeLog
index bc89e98ec7d13b1cf5375f0a8ea81ec905d32ab6..d40d9ef4054b3eb5c78081e6f3f6fc0a0a17e8f0 100755 (executable)
--- a/mcs/class/System.Runtime.Serialization/System.Xml/ChangeLog
+++ b/mcs/class/System.Runtime.Serialization/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-23  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XmlBinaryDictionaryReader.cs : fix regression on stream consumption
+         excess.
+
 2009-05-22  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XmlBinaryDictionaryReader.cs : ReadContentString() returned

diff --git a/mcs/class/System.Runtime.Serialization/System.Xml/XmlBinaryDictionaryReader.cs b/mcs/class/System.Runtime.Serialization/System.Xml/XmlBinaryDictionaryReader.cs
index 4787fa22602ce129063d9735725bf770712885ae..0352d772c4afec174675d73fb496f97f75fad76b 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/System.Xml/XmlBinaryDictionaryReader.cs
+++ b/mcs/class/System.Runtime.Serialization/System.Xml/XmlBinaryDictionaryReader.cs
@@ -72,6 +72,8 @@ namespace System.Xml
 
                        public int ReadByte ()
                        {
+                               if (reader.PeekChar () < 0)
+                                       return -1;
                                return reader.ReadByte ();
                        }