procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make ftcrfont_close idempotent

Browse source 
This prevents crashes when running code like:

(let ((font (open-font (find-font (font-spec ...)))))
  (close-font font)
  (close-font font))

* src/ftcrfont.c (ftcrfont_close): Make sure the function can be run
several times in a row without crashing.
This commit is contained in:
Pip Cet 2024-08-10 16:57:49 +00:00
parent 6c68600351
commit 1a38936299
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/ftcrfont.c
View file

@ -344,12 +344,20 @@ ftcrfont_close (struct font *font)
ftcrfont_info->hb_font = NULL;
}
#endif
for (int i = 0; i < ftcrfont_info->metrics_nrows; i++)
if (ftcrfont_info->metrics[i])
xfree (ftcrfont_info->metrics[i]);
if (ftcrfont_info->metrics)
xfree (ftcrfont_info->metrics);
cairo_scaled_font_destroy (ftcrfont_info->cr_scaled_font);
{
for (int i = 0; i < ftcrfont_info->metrics_nrows; i++)
if (ftcrfont_info->metrics[i])
xfree (ftcrfont_info->metrics[i]);
if (ftcrfont_info->metrics)
xfree (ftcrfont_info->metrics);
ftcrfont_info->metrics = NULL;
}
if (ftcrfont_info->cr_scaled_font)
{
cairo_scaled_font_destroy (ftcrfont_info->cr_scaled_font);
ftcrfont_info->cr_scaled_font = NULL;
}
unblock_input ();
}