2002-03-24 Mike Kestner <[email protected]>

	* StreamReader.cs (ReadBuffer): Fix buffer merging bugs.

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

mcs/class/corlib/System.IO/ChangeLog

@@ -1,3 +1,7 @@
+2002-03-24  Mike Kestner <[email protected]>
+
+	* StreamReader.cs (ReadBuffer): Fix buffer merging bugs.
+
 2002-03-23  Martin Baulig  <[email protected]>
 
 	* StreamReader.cs: Always do buffered reading, use 4k blocks.

mcs/class/corlib/System.IO/StreamReader.cs

@@ -130,7 +130,7 @@ namespace System.IO {
 		private bool ReadBuffer (int count)
 		{
 			// There are still enough bytes in the buffer.
-			if ((buffer != null) && (pos + count < buffer.Length))
+			if ((buffer != null) && (pos + count <= buffer.Length))
 				return true;
 
 			// Number of bytes remaining in the buffer.
@@ -147,11 +147,11 @@ namespace System.IO {
 			int bufcnt = decoder.GetCharCount (bytes, 0, cnt);
 			char[] newbuffer = new char [remaining + bufcnt];
 			if (remaining > 0)
-				Array.Copy (buffer, newbuffer, remaining);
+				Array.Copy (buffer, pos, newbuffer, 0, remaining);
 			buffer = newbuffer;
 
 			bufcnt = decoder.GetChars (bytes, 0, cnt, buffer, remaining);
-			pos = remaining;
+			pos = 0;
 
 			return true;
 		}