2007-01-24 Gonzalo Paniagua Javier <gonzalo.mono@gmail.com>

	* StreamReader.cs: fix for bug #75526. We return earlier from Read () if
	the underlying stream might block or end on the next read.

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

diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
index 9b0f387c3dba0cceb19b01db1db77630220dd4e8..07d36a4f9d1097318da165e3e86c74a1f6a065c8 100644 (file)
--- a/mcs/class/corlib/System.IO/ChangeLog
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-24 Gonzalo Paniagua Javier <gonzalo.mono@gmail.com>
+
+       * StreamReader.cs: fix for bug #75526. We return earlier from Read () if
+       the underlying stream might block or end on the next read.
+
 2007-01-22  Miguel de Icaza  <miguel@novell.com>
 
        * DirectoryInfo.cs: Throw a better exception (accorind go the

diff --git a/mcs/class/corlib/System.IO/StreamReader.cs b/mcs/class/corlib/System.IO/StreamReader.cs
index 9102031f2f3ef4bfd276129172d6180c0f990282..3599f25ac7408038bf9bab6a32dd8667dcfcfee8 100644 (file)
--- a/mcs/class/corlib/System.IO/StreamReader.cs
+++ b/mcs/class/corlib/System.IO/StreamReader.cs
@@ -375,6 +375,8 @@ namespace System.IO {
                                index += cch;
                                count -= cch;
                                chars_read += cch;
+                               if (mayBlock)
+                                       break;
                        }
                        return chars_read;
                }