diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-26 15:15:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-26 15:17:31 +0100 |
| commit | 2de1b86d79ca29c53d31606a10ac745d3621fb2b (patch) | |
| tree | 3ee1c72c4a9b58d86f09ebc0a6c59de79ba1c731 /external/harfbuzz | |
| parent | 3f5ccf572a12d1ac54d47ab7fcdc23f7bb8f132b (diff) | |
external/harfbuzz: Fix types of functions called via pointer
(-fsanitize=function)
Change-Id: I009f1558990a46900e2dfa56492827cb6dcfb3cd
Diffstat (limited to 'external/harfbuzz')
| -rw-r--r-- | external/harfbuzz/ubsan.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch index 3bdb589a1f66..6c301c4df048 100644 --- a/external/harfbuzz/ubsan.patch +++ b/external/harfbuzz/ubsan.patch @@ -42,3 +42,45 @@ } template <typename Type> static inline bool hb_object_set_user_data (Type *obj, +--- src/hb-ot-map-private.hh ++++ src/hb-ot-map-private.hh +@@ -52,8 +52,12 @@ + unsigned int needs_fallback : 1; + unsigned int auto_zwj : 1; + +- static int cmp (const feature_map_t *a, const feature_map_t *b) +- { return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0; } ++ static int cmp (const void *va, const void *vb) ++ { ++ const feature_map_t *a = static_cast<const feature_map_t *>(va); ++ const feature_map_t *b = static_cast<const feature_map_t *>(vb); ++ return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0; ++ } + }; + + struct lookup_map_t { +--- src/hb-ot-tag.cc ++++ src/hb-ot-tag.cc +@@ -591,9 +591,11 @@ + }; + + static int +-lang_compare_first_component (const char *a, +- const char *b) ++lang_compare_first_component (const void *va, ++ const void *vb) + { ++ const char *a = static_cast<const char *>(va); ++ const char *b = static_cast<const char *>(vb); + unsigned int da, db; + const char *p; + +@@ -641,7 +643,7 @@ + /* Find a language matching in the first component */ + lang_tag = (LangTag *) bsearch (lang_str, ot_languages, + ARRAY_LENGTH (ot_languages), sizeof (LangTag), +- (hb_compare_func_t) lang_compare_first_component); ++ lang_compare_first_component); + if (lang_tag) + return lang_tag->tag; + |