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

[font-funcs] Handle case of null func but non-null destroy or user-data

This commit is contained in:
Behdad Esfahbod 2022-06-01 09:19:11 -06:00
parent 88ccbd2c43
commit bc6ecaa262
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-font.cc
View File

@ -832,6 +832,14 @@ hb_font_funcs_set_##name##_func (hb_font_funcs_t *ffuncs, \
{ \ { \
if (hb_object_is_immutable (ffuncs)) \ if (hb_object_is_immutable (ffuncs)) \
goto fail; \ goto fail; \
\
if (!func) \
{ \
if (destroy) \
destroy (user_data); \
destroy = nullptr; \
user_data = nullptr; \
} \
\ \
if (ffuncs->destroy && ffuncs->destroy->name) \ if (ffuncs->destroy && ffuncs->destroy->name) \
ffuncs->destroy->name (!ffuncs->user_data ? nullptr : ffuncs->user_data->name); \ ffuncs->destroy->name (!ffuncs->user_data ? nullptr : ffuncs->user_data->name); \