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

Fix hb_bytes_t.cmp() 

Ouch!
This commit is contained in:
Behdad Esfahbod 2018-11-10 15:38:48 -05:00
parent 5547bfa9f2
commit 929f07dbfc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-dsalgs.hh
View File

@ -530,10 +530,12 @@ struct hb_bytes_t
inline int cmp (const hb_bytes_t &a) const inline int cmp (const hb_bytes_t &a) const
{ {
if (len != a.len) if (!len) return 0; /* glibc's memcmp() args are declared nonnull. Meh. */
return (int) a.len - (int) len;
return memcmp (a.arrayZ, arrayZ, len); int r = memcmp (a.arrayZ, arrayZ, len);
if (r) return r;
return a.len < len ? -1 : a.len > len ? +1 : 0;
} }
static inline int cmp (const void *pa, const void *pb) static inline int cmp (const void *pa, const void *pb)
{ {