* guard agains empty arrays in a few tArrayHelper binsearch methods

fixes bug #39761
loongson · Jun 5, 2022 · 4710281 · 4710281
1 parent 2df9dd9
commit 4710281
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/packages/rtl-generics/src/generics.collections.pas b/packages/rtl-generics/src/generics.collections.pas
@@ -1057,6 +1057,13 @@ class function TArrayHelper<T>.BinarySearch(constref AValues: array of T; constr
 var
   imin, imax, imid: Int32;
 begin
+  if Length(AValues) = 0 then
+  begin
+    ASearchResult.CompareResult := 0;
+    ASearchResult.FoundIndex := -1;
+    ASearchResult.CandidateIndex := -1;
+    Exit(False);
+  end;
   // continually narrow search until just one element remains
   imin := AIndex;
   imax := Pred(AIndex + ACount);
@@ -1121,6 +1128,12 @@ class function TArrayHelper<T>.BinarySearch(constref AValues: array of T; constr
   imin, imax, imid: Int32;
   LCompare: SizeInt;
 begin
+  if Length(AValues) = 0 then
+  begin
+    AFoundIndex := -1;
+    Exit(False);
+  end;
+
   // continually narrow search until just one element remains
   imin := AIndex;
   imax := Pred(AIndex + ACount);