Merge pull request #1847 from riganti/fix/near-page-index-OOR-v5

Fix near page indexes crashing on invalid page number
riganti · Aug 17, 2024 · 2bbf954 · 2bbf954
2 parents d824028 + ba42313
commit 2bbf954
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Framework/Core/Controls/Options/PagingOptions.cs b/src/Framework/Core/Controls/Options/PagingOptions.cs
@@ -107,8 +107,10 @@ public virtual IList<int> GetNearPageIndexes()
         /// </summary>
         protected virtual IList<int> GetDefaultNearPageIndexes(int distance)
         {
-            var firstIndex = Math.Max(PageIndex - distance, 0);
-            var lastIndex = Math.Min(PageIndex + distance + 1, PagesCount);
+            var count = this.PagesCount;
+            var index = Math.Max(0, Math.Min(count - 1, PageIndex)); // clamp index to be a valid page
+            var firstIndex = Math.Max(index - distance, 0);
+            var lastIndex = Math.Min(index + distance + 1, count);
             return Enumerable
                 .Range(firstIndex, lastIndex - firstIndex)
                 .ToList();