* roottypes.cs: Rename from tree.cs.

[mono.git] / mcs / class / corlib / System / ArraySegment.cs

diff --git a/mcs/class/corlib/System/ArraySegment.cs b/mcs/class/corlib/System/ArraySegment.cs
index f1fab2f269616dd534023803d2b65a8e5b090ad0..d0a7603a43ed8337f7d7eb64935aa82cc64751e3 100644 (file)
--- a/mcs/class/corlib/System/ArraySegment.cs
+++ b/mcs/class/corlib/System/ArraySegment.cs
@@ -30,19 +30,30 @@ namespace System {
        [Serializable]
        public struct ArraySegment <T> {
                T [] array;
-               int offset, length;
+               int offset, count;
                
-               public ArraySegment (T [] array, int offset, int length)
+               public ArraySegment (T [] array, int offset, int count)
                {
                        if (array == null)
                                throw new ArgumentNullException ("array");
                        
-                       if (offset >= array.Length || (offset + length) >= array.Length)
+                       if (offset < 0)
+                               throw new ArgumentOutOfRangeException ("offset", "Non-negative number required.");
+
+                       if (count < 0)
+                               throw new ArgumentOutOfRangeException ("count", "Non-negative number required.");
+
+                       if (offset > array.Length)
                                throw new ArgumentException ("out of bounds");
+
+                       // now offset is valid, or just beyond the end.
+                       // Check count -- do it this way to avoid overflow on 'offset + count'
+                       if (array.Length - offset < count)
+                               throw new ArgumentException ("out of bounds", "offset");
                        
                        this.array = array;
                        this.offset = offset;
-                       this.length = length;
+                       this.count = count;
                }
                
                public ArraySegment (T [] array)
@@ -52,7 +63,7 @@ namespace System {
                        
                        this.array = array;
                        this.offset = 0;
-                       this.length = array.Length;
+                       this.count = array.Length;
                }
                
                public T [] Array {
@@ -64,8 +75,8 @@ namespace System {
                }
                
                public int Count {
-                       get { return length; }
+                       get { return count; }
                }
        }
 }
-#endif
\ No newline at end of file
+#endif