Fix Hashtable.CopyTo (#23)

nanoframework · Sep 12, 2018 · de45317 · de45317
1 parent d9e569d
commit de45317
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/source/System/Collections/HashTable.cs b/source/System/Collections/HashTable.cs
@@ -140,12 +140,13 @@ private void Rehash(int newSize)
         //implementation for KeyCollection and ValueCollection copyTo method
         private void CopyToCollection(Array array, int index, EnumeratorType type)
         {
-            if (index < 0 && index > _numberOfBuckets) throw new IndexOutOfRangeException("index");
+            if (index < 0 || index >= array.Length) throw new IndexOutOfRangeException("index");
+            if ((index + Count) > array.Length) throw new IndexOutOfRangeException("array length");
 
-            var j = 0;
+            var j = index;
             var len = array.Length;
 
-            for (var i = index; i < _numberOfBuckets; i++)
+            for (var i = 0; i < _numberOfBuckets; i++)
             {
                 for (var cur = _buckets[i]; cur != null && j < len; cur = cur.next)
                 {
@@ -229,15 +230,18 @@ public object SyncRoot
         /// <param name="index">The zero-based index in array at which copying begins.</param>
         public void CopyTo(Array array, int index)
         {
-            if (index < 0 && index > _buckets.Length) throw new IndexOutOfRangeException("index");
+            if (index < 0 || index >= array.Length) throw new IndexOutOfRangeException("index");
+            if ((index + _count) > array.Length) throw new IndexOutOfRangeException("array length");
 
-            var j = 0;
+            var j = index;
             var len = array.Length;
-            for (var i = index; i < _buckets.Length; i++)
+
+            for (var i = 0; i < _numberOfBuckets; i++)
             {
                 for (var cur = _buckets[i]; cur != null && j < len; cur = cur.next)
                 {
                     ((IList)array)[j] = new DictionaryEntry(cur.key, cur.value);
+
                     j++;
                 }
             }