From b17d072fc6acad54c5a526b9cddc18cf517313ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Strehovsk=C3=BD?= Date: Tue, 26 Jun 2018 16:17:53 +0200 Subject: [PATCH] Fix bogus assert in ArraySortHelper (dotnet/corertdotnet/coreclr#6018) Fixes dotnet/coreclr#6016. Resolves dotnet/coreclr#6015. Signed-off-by: dotnet-bot Commit migrated from https://github.com/dotnet/coreclr/commit/bcabe118b783feb489c791e340f1c3ea792acde2 --- .../src/System/Collections/Generic/ArraySortHelper.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs index b717bd7..03b9865 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs @@ -654,10 +654,10 @@ namespace System.Collections.Generic private static void SwapIfGreaterWithItems(TKey[] keys, TValue[] values, IComparer comparer, int a, int b) { Debug.Assert(keys != null); - Debug.Assert(values != null && values.Length >= keys.Length); + Debug.Assert(values != null); Debug.Assert(comparer != null); - Debug.Assert(0 <= a && a < keys.Length); - Debug.Assert(0 <= b && b < keys.Length); + Debug.Assert(0 <= a && a < keys.Length && a < values.Length); + Debug.Assert(0 <= b && b < keys.Length && b < values.Length); if (a != b) { -- 2.7.4