26 lines
939 B
Diff
26 lines
939 B
Diff
commit e4d8117b82065dc72e8df80097360e7c05a349b9
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Tue Nov 21 16:45:35 2023 +0100
|
|
|
|
stdlib: Avoid another self-comparison in qsort
|
|
|
|
In the insertion phase, we could run off the start of the array if the
|
|
comparison function never runs zero. In that case, it never finds the
|
|
initial element that terminates the iteration.
|
|
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
|
|
diff --git a/stdlib/qsort.c b/stdlib/qsort.c
|
|
index 2ee39e2c492f792e..0d5f8b92e8072965 100644
|
|
--- a/stdlib/qsort.c
|
|
+++ b/stdlib/qsort.c
|
|
@@ -218,7 +218,7 @@ insertion_sort_qsort_partitions (void *const pbase, size_t total_elems,
|
|
while ((run_ptr += size) <= end_ptr)
|
|
{
|
|
tmp_ptr = run_ptr - size;
|
|
- while (cmp (run_ptr, tmp_ptr, arg) < 0)
|
|
+ while (run_ptr != tmp_ptr && cmp (run_ptr, tmp_ptr, arg) < 0)
|
|
tmp_ptr -= size;
|
|
|
|
tmp_ptr += size;
|