From 89949ed28db96edabeb09433fcc09f28168163d2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 30 Dec 2018 01:52:19 -0500 Subject: [PATCH] Fix ubsan with passing nullptr to qsort() --- src/hb-array.hh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/hb-array.hh b/src/hb-array.hh index a4dce4b..52b775e 100644 --- a/src/hb-array.hh +++ b/src/hb-array.hh @@ -119,19 +119,22 @@ struct hb_array_t : hb_sorted_array_t qsort (int (*cmp_)(const void*, const void*)) { - ::qsort (arrayZ, length, this->item_size, cmp_); + if (likely (length)) + ::qsort (arrayZ, length, this->item_size, cmp_); return hb_sorted_array_t (*this); } hb_sorted_array_t qsort () { - ::qsort (arrayZ, length, this->item_size, Type::cmp); + if (likely (length)) + ::qsort (arrayZ, length, this->item_size, Type::cmp); return hb_sorted_array_t (*this); } void qsort (unsigned int start, unsigned int end) { end = MIN (end, length); assert (start <= end); - ::qsort (arrayZ + start, end - start, this->item_size, Type::cmp); + if (likely (start < end)) + ::qsort (arrayZ + start, end - start, this->item_size, Type::cmp); } /* -- 2.7.4