diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2020-06-19 10:35:57 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2020-06-19 10:37:50 +0200 |
| commit | 8ed5a2477eecf27e645bbb568b66a37eea12973c (patch) | |
| tree | fc8509f6f304439c85bff8f579ff3f228dfcb501 | |
| parent | d1180b5f9598088ab1bc9d772e5e09ece0702a38 (diff) | |
| download | freetype2-8ed5a2477eecf27e645bbb568b66a37eea12973c.tar.gz | |
[cff, cid] Fix segfaults in case of error (#58621).
* src/cff/cffobjs.c (cff_slot_done), src/cid/cidobjs.c
(cid_slot_done): If `ft_glyphslot_init' fails to allocate
`internal', then the class' `done_slot' callback (called by
`ft_glyphslot_done') must not dereference the pointer to `internal'.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/cff/cffobjs.c | 3 | ||||
| -rw-r--r-- | src/cid/cidobjs.c | 3 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2020-06-19 Sebastian Rasmussen <sebras@gmail.com> + + [cff, cid] Fix segfaults in case of error (#58621). + + * src/cff/cffobjs.c (cff_slot_done), src/cid/cidobjs.c + (cid_slot_done): If `ft_glyphslot_init' fails to allocate + `internal', then the class' `done_slot' callback (called by + `ft_glyphslot_done') must not dereference the pointer to `internal'. + 2020-06-19 Werner Lemberg <wl@gnu.org> [base] Fix UBSAN error. diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 252f58a5b..aa959ede9 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -352,7 +352,8 @@ FT_LOCAL_DEF( void ) cff_slot_done( FT_GlyphSlot slot ) { - slot->internal->glyph_hints = NULL; + if ( slot->internal ) + slot->internal->glyph_hints = NULL; } diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 2d284ca55..04b295eb8 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -49,7 +49,8 @@ FT_LOCAL_DEF( void ) cid_slot_done( FT_GlyphSlot slot ) { - slot->internal->glyph_hints = NULL; + if ( slot->internal ) + slot->internal->glyph_hints = NULL; } |