external/harfbuzz/ubsan.patch

   1 --- src/hb-ot-map-private.hh
   2 +++ src/hb-ot-map-private.hh
   3 @@ -52,8 +52,11 @@
   4      unsigned int needs_fallback : 1;
   5      unsigned int auto_zwj : 1;
   6
   7 -    static int cmp (const feature_map_t *a, const feature_map_t *b)
   8 -    { return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0; }
   9 +    static int cmp (void const * a_, void const * b_) {
  10 +      feature_map_t const * a = static_cast<feature_map_t const *>(a_);
  11 +      feature_map_t const * b = static_cast<feature_map_t const *>(b_);
  12 +      return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0;
  13 +    }
  14    };
  15
  16    struct lookup_map_t {
  17 --- src/hb-ot-tag.cc
  18 +++ src/hb-ot-tag.cc
  19 @@ -778,9 +778,11 @@
  20  };
  21
  22  static int
  23 -lang_compare_first_component (const char *a,
  24 -                             const char *b)
  25 +lang_compare_first_component (void const * a_,
  26 +                             void const * b_)
  27  {
  28 +  char const * a = static_cast<char const *>(a_);
  29 +  char const * b = static_cast<char const *>(b_);
  30    unsigned int da, db;
  31    const char *p;
  32