Fix hb_bytes_t.cmp()

Ouch!
2018-11-10 15:38:48 -05:00 · 2018-11-10 15:38:48 -05:00 · 929f07dbfc
parent 5547bfa9f2
commit 929f07dbfc
1 changed files with 5 additions and 3 deletions
--- a/src/hb-dsalgs.hh
+++ b/src/hb-dsalgs.hh
@ -530,10 +530,12 @@ struct hb_bytes_t

  inline int cmp (const hb_bytes_t &a) const
  {
-    if (len != a.len)
-      return (int) a.len - (int) len;
+    if (!len) return 0; /* glibc's memcmp() args are declared nonnull.  Meh. */

-    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)
  {