diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-06-07 18:53:26 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-06-07 19:11:49 -0700 |
| commit | 4d176b742774670c5c265a06f742e63a43f5f7ab (patch) | |
| tree | 37aa1e3ed6537f8430e9c54a126423d27bc7e360 /src | |
| parent | b76389f22070bb61811eeea41635640d31115fd9 (diff) | |
| download | emacs-4d176b742774670c5c265a06f742e63a43f5f7ab.tar.gz emacs-4d176b742774670c5c265a06f742e63a43f5f7ab.tar.bz2 emacs-4d176b742774670c5c265a06f742e63a43f5f7ab.zip | |
Fix ftfont_open2 failure cleanup
* src/ftfont.c (ftfont_open2): Don’t increment counter if failing.
Avoid use-after-free once the increment bug is fixed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftfont.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 9a8777ef078..a53467000f3 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1131,16 +1131,19 @@ ftfont_open2 (struct frame *f, return Qnil; } } - set_save_integer (val, 1, XSAVE_INTEGER (val, 1) + 1); size = XINT (AREF (entity, FONT_SIZE_INDEX)); if (size == 0) size = pixel_size; if (FT_Set_Pixel_Sizes (ft_face, size, size) != 0) { if (XSAVE_INTEGER (val, 1) == 0) - FT_Done_Face (ft_face); + { + FT_Done_Face (ft_face); + cache_data->ft_face = NULL; + } return Qnil; } + set_save_integer (val, 1, XSAVE_INTEGER (val, 1) + 1); ASET (font_object, FONT_FILE_INDEX, filename); font = XFONT_OBJECT (font_object); |