fix(demo): index out of range when start index + count > overallCount

Chaoses-Ib · Chaoses-Ib · commit d68c78ebcaea · 2023-08-27T03:43:39.000+08:00
diff --git a/DataVirtualizationDemo/Window1.xaml.cs b/DataVirtualizationDemo/Window1.xaml.cs
@@ -108,6 +108,8 @@ public IList<Person> LoadRange(int startIndex, int count, SortDescriptionCollect
             SortDescription sortDescription = sortDescriptions == null || sortDescriptions.Count == 0 ? new SortDescription() : sortDescriptions[0];
             ListSortDirection direction = string.IsNullOrEmpty(sortDescription.PropertyName) ? ListSortDirection.Ascending : sortDescription.Direction;
 
+            count = Math.Min(count, overallCount - startIndex);
+
             Person[] persons = new Person[count];
             for (int i = 0; i < count; i++)
             {
diff --git a/README.md b/README.md
@@ -229,6 +229,8 @@ public IList<Person> LoadRange(int startIndex, int count, SortDescriptionCollect
     SortDescription sortDescription = sortDescriptions == null || sortDescriptions.Count == 0 ? new SortDescription() : sortDescriptions[0];
     ListSortDirection direction = string.IsNullOrEmpty(sortDescription.PropertyName) ? ListSortDirection.Ascending : sortDescription.Direction;
 
+    count = Math.Min(count, overallCount - startIndex);
+
     Person[] persons = new Person[count];
     for (int i = 0; i < count; i++)
     {

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,8 @@ public IList<Person> LoadRange(int startIndex, int count, SortDescriptionCollect`
`108`	`108`	`SortDescription sortDescription = sortDescriptions == null \|\| sortDescriptions.Count == 0 ? new SortDescription() : sortDescriptions[0];`
`109`	`109`	`ListSortDirection direction = string.IsNullOrEmpty(sortDescription.PropertyName) ? ListSortDirection.Ascending : sortDescription.Direction;`
`110`	`110`
	`111`	`+ count = Math.Min(count, overallCount - startIndex);`
	`112`	`+`
`111`	`113`	`Person[] persons = new Person[count];`
`112`	`114`	`for (int i = 0; i < count; i++)`
`113`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,8 @@ public IList<Person> LoadRange(int startIndex, int count, SortDescriptionCollect`
`229`	`229`	`SortDescription sortDescription = sortDescriptions == null \|\| sortDescriptions.Count == 0 ? new SortDescription() : sortDescriptions[0];`
`230`	`230`	`ListSortDirection direction = string.IsNullOrEmpty(sortDescription.PropertyName) ? ListSortDirection.Ascending : sortDescription.Direction;`
`231`	`231`
	`232`	`+ count = Math.Min(count, overallCount - startIndex);`
	`233`	`+`
`232`	`234`	`Person[] persons = new Person[count];`
`233`	`235`	`for (int i = 0; i < count; i++)`
`234`	`236`	`{`