1 files changed, 4 insertions, 1 deletions
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlXmlTextReader.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlXmlTextReader.cs
index 4bd8a6eeea3..908ab0b5058 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlXmlTextReader.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlXmlTextReader.cs
@@ -78,7 +78,6 @@ namespace System.Data.SqlClient {
 			else {
 				eof = true;
 				localBuffer = "</results>";
-				return false;
 			}
 			return true;
 		}
@@ -91,6 +90,8 @@ namespace System.Data.SqlClient {
 				if (!moreResults)
 					return -1;
 			}
+			if (eof && position >= localBuffer.Length)
+				return -1;
 			return (int) localBuffer[position];
 		}
 			
@@ -98,6 +99,8 @@ namespace System.Data.SqlClient {
 		{
 			int result = Peek ();
 			position += 1;
+			if (!eof && position >= localBuffer.Length)
+				GetNextBuffer ();
 			return result;
 		}