AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ubsan with passing nullptr to qsort()

Browse Source
This commit is contained in:
Behdad Esfahbod 2018-12-30 01:52:19 -05:00
parent 357a0a7ad3
commit 89949ed28d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-array.hh
View File

@ -119,11 +119,13 @@ struct hb_array_t :
hb_sorted_array_t<Type> qsort (int (*cmp_)(const void*, const void*)) hb_sorted_array_t<Type> qsort (int (*cmp_)(const void*, const void*))
{ {
if (likely (length))
::qsort (arrayZ, length, this->item_size, cmp_); ::qsort (arrayZ, length, this->item_size, cmp_);
return hb_sorted_array_t<Type> (*this); return hb_sorted_array_t<Type> (*this);
} }
hb_sorted_array_t<Type> qsort () hb_sorted_array_t<Type> qsort ()
{ {
if (likely (length))
::qsort (arrayZ, length, this->item_size, Type::cmp); ::qsort (arrayZ, length, this->item_size, Type::cmp);
return hb_sorted_array_t<Type> (*this); return hb_sorted_array_t<Type> (*this);
} }
@ -131,6 +133,7 @@ struct hb_array_t :
{ {
end = MIN (end, length); end = MIN (end, length);
assert (start <= end); assert (start <= end);
if (likely (start < end))
::qsort (arrayZ + start, end - start, this->item_size, Type::cmp); ::qsort (arrayZ + start, end - start, this->item_size, Type::cmp);
} }