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

Fix possible leaks

This commit is contained in:
Behdad Esfahbod 2011-09-21 16:49:33 -04:00
parent d3f3690b48
commit 0cd33592ab
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hb-font.cc
View File

@ -286,8 +286,11 @@ hb_font_funcs_set_##name##_func (hb_font_funcs_t *ffuncs, \
void *user_data, \ void *user_data, \
hb_destroy_func_t destroy) \ hb_destroy_func_t destroy) \
{ \ { \
if (ffuncs->immutable) \ if (ffuncs->immutable) { \
if (destroy) \
destroy (user_data); \
return; \ return; \
} \
\ \
if (ffuncs->destroy.name) \ if (ffuncs->destroy.name) \
ffuncs->destroy.name (ffuncs->user_data.name); \ ffuncs->destroy.name (ffuncs->user_data.name); \
@ -901,8 +904,11 @@ hb_font_set_funcs (hb_font_t *font,
void *user_data, void *user_data,
hb_destroy_func_t destroy) hb_destroy_func_t destroy)
{ {
if (font->immutable) if (font->immutable) {
if (destroy)
destroy (user_data);
return; return;
}
if (font->destroy) if (font->destroy)
font->destroy (font->user_data); font->destroy (font->user_data);
@ -922,8 +928,12 @@ hb_font_set_funcs_data (hb_font_t *font,
void *user_data, void *user_data,
hb_destroy_func_t destroy) hb_destroy_func_t destroy)
{ {
if (font->immutable) /* Destroy user_data? */
if (font->immutable) {
if (destroy)
destroy (user_data);
return; return;
}
if (font->destroy) if (font->destroy)
font->destroy (font->user_data); font->destroy (font->user_data);