2003-07-31 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* NetworkStream.cs:
	* Socket.cs: fixed array boundary checks. 0 sized arrays are allowed.

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

3 files changed, 17 insertions, 12 deletions

diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog
index 236f5139a63..b3a908c22bb 100644
--- a/mcs/class/System/System.Net.Sockets/ChangeLog
+++ b/mcs/class/System/System.Net.Sockets/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-31  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* NetworkStream.cs:
+	* Socket.cs: fixed array boundary checks. 0 sized arrays are allowed.
+
 2003-07-18  Andreas Nahr <ClassDevelopment@A-SoftTech.com>
 
 	* Socket.cs: Added GetHashCode method
diff --git a/mcs/class/System/System.Net.Sockets/NetworkStream.cs b/mcs/class/System/System.Net.Sockets/NetworkStream.cs
index 426cd41a008..f522184830a 100644
--- a/mcs/class/System/System.Net.Sockets/NetworkStream.cs
+++ b/mcs/class/System/System.Net.Sockets/NetworkStream.cs
@@ -132,10 +132,10 @@ namespace System.Net.Sockets
 			if (buffer == null)
 				throw new ArgumentNullException ("buffer is null");
 			int len = buffer.Length;
-			if(offset<0 || offset>=len) {
+			if(offset<0 || offset>len) {
 				throw new ArgumentOutOfRangeException("offset exceeds the size of buffer");
 			}
-			if(offset+size<0 || offset+size>len) {
+			if(size<0 || offset+size>len) {
 				throw new ArgumentOutOfRangeException("offset+size exceeds the size of buffer");
 			}
 
@@ -158,10 +158,10 @@ namespace System.Net.Sockets
 				throw new ArgumentNullException ("buffer is null");
 
 			int len = buffer.Length;
-			if(offset<0 || offset>=len) {
+			if(offset<0 || offset>len) {
 				throw new ArgumentOutOfRangeException("offset exceeds the size of buffer");
 			}
-			if(offset+size<0 || offset+size>len) {
+			if(size<0 || offset+size>len) {
 				throw new ArgumentOutOfRangeException("offset+size exceeds the size of buffer");
 			}
 
@@ -245,10 +245,10 @@ namespace System.Net.Sockets
 
 			if (buffer == null)
 				throw new ArgumentNullException ("buffer is null");
-			if(offset<0 || offset>=buffer.Length) {
+			if(offset<0 || offset>buffer.Length) {
 				throw new ArgumentOutOfRangeException("offset exceeds the size of buffer");
 			}
-			if(offset+size < 0 || offset+size>buffer.Length) {
+			if(size < 0 || offset+size>buffer.Length) {
 				throw new ArgumentOutOfRangeException("offset+size exceeds the size of buffer");
 			}
 
diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
index 40ea103a1c5..3d8476cae98 100644
--- a/mcs/class/System/System.Net.Sockets/Socket.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -857,10 +857,10 @@ namespace System.Net.Sockets
 			if(buf==null) {
 				throw new ArgumentNullException("buffer is null");
 			}
-			if(offset<0 || offset >= buf.Length) {
+			if(offset<0 || offset > buf.Length) {
 				throw new ArgumentOutOfRangeException("offset exceeds the size of buffer");
 			}
-			if(offset+size<0 || offset+size > buf.Length) {
+			if(size<0 || offset+size > buf.Length) {
 				throw new ArgumentOutOfRangeException("offset+size exceeds the size of buffer");
 			}
 			
@@ -913,10 +913,10 @@ namespace System.Net.Sockets
 			if(remote_end==null) {
 				throw new ArgumentNullException("remote endpoint is null");
 			}
-			if(offset<0 || offset>=buf.Length) {
+			if(offset<0 || offset>buf.Length) {
 				throw new ArgumentOutOfRangeException("offset exceeds the size of buffer");
 			}
-			if(offset+size<0 || offset+size>buf.Length) {
+			if(size<0 || offset+size>buf.Length) {
 				throw new ArgumentOutOfRangeException("offset+size exceeds the size of buffer");
 			}
 
@@ -1018,10 +1018,10 @@ namespace System.Net.Sockets
 			if(remote_end==null) {
 				throw new ArgumentNullException("remote endpoint is null");
 			}
-			if(offset<0 || offset>=buffer.Length) {
+			if(offset<0 || offset>buffer.Length) {
 				throw new ArgumentOutOfRangeException("offset exceeds the size of buffer");
 			}
-			if(offset+size<0 || offset+size>buffer.Length) {
+			if(size<0 || offset+size>buffer.Length) {
 				throw new ArgumentOutOfRangeException("offset+size exceeds the size of buffer");
 			}