Fix out of bounds

dotnet · Oct 12, 2019 · 5d04012 · 5d04012
1 parent 6d568ad
commit 5d04012
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs b/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs
@@ -358,7 +358,11 @@ private ref TValue FindValueOrNull(TKey key)
                         {
                             // Should be a while loop https://github.com/dotnet/coreclr/issues/15476
                             // Test in if to drop range check for following array access
-                            if ((uint)i >= (uint)entries.Length || (entries[i].hashCode == hashCode && EqualityComparer<TKey>.Default.Equals(entries[i].key, key)))
+                            if ((uint)i >= (uint)entries.Length)
+                            {
+                                break; // Not found
+                            }
+                            else if (entries[i].hashCode == hashCode && EqualityComparer<TKey>.Default.Equals(entries[i].key, key))
                             {
                                 value = ref entries[i].value;
                                 break;
@@ -384,7 +388,11 @@ private ref TValue FindValueOrNull(TKey key)
                         {
                             // Should be a while loop https://github.com/dotnet/coreclr/issues/15476
                             // Test in if to drop range check for following array access
-                            if ((uint)i >= (uint)entries.Length || (entries[i].hashCode == hashCode && defaultComparer.Equals(entries[i].key, key)))
+                            if ((uint)i >= (uint)entries.Length)
+                            {
+                                break; // Not found
+                            }
+                            else if (entries[i].hashCode == hashCode && defaultComparer.Equals(entries[i].key, key))
                             {
                                 value = ref entries[i].value;
                                 break;
@@ -410,8 +418,11 @@ private ref TValue FindValueOrNull(TKey key)
                     {
                         // Should be a while loop https://github.com/dotnet/coreclr/issues/15476
                         // Test in if to drop range check for following array access
-                        if ((uint)i >= (uint)entries.Length ||
-                            (entries[i].hashCode == hashCode && comparer.Equals(entries[i].key, key)))
+                        if ((uint)i >= (uint)entries.Length)
+                        {
+                            break; // Not found
+                        }
+                        else if (entries[i].hashCode == hashCode && comparer.Equals(entries[i].key, key))
                         {
                             value = ref entries[i].value;
                             break;