diff options
| author | Ewald Hew <ewaldhew@gmail.com> | 2017-10-16 11:48:31 +0800 |
|---|---|---|
| committer | Ewald Hew <ewaldhew@gmail.com> | 2017-10-16 19:17:30 +0800 |
| commit | 94f6d57a4c4264e59493ccdf9b8cef92600c0c25 (patch) | |
| tree | 4dde81b10a8974a0c4ad00bf6a4129a76e057343 | |
| parent | ccb0f7998da38aeb5cb353a6f9656f9846a397f4 (diff) | |
| download | freetype2-94f6d57a4c4264e59493ccdf9b8cef92600c0c25.tar.gz | |
[cff] Fix segfault on missing `psaux' (#52218)
* src/cff/cffload.c (cff_done_blend): Add a check for possible nullptr.
* modules.cfg: Update dependency list.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | modules.cfg | 2 | ||||
| -rw-r--r-- | src/cff/cffload.c | 3 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2017-10-12 Ewald Hew <ewaldhew@gmail.com> + + [cff] Fix segfault on missing `psaux' (#52218) + + * src/cff/cffload.c (cff_done_blend): Add a check for possible nullptr. + + * modules.cfg: Update dependency list. + 2017-10-15 Alexei Podtelezhnikov <apodtele@gmail.com> [base, cff] Fix MSVC warnings. diff --git a/modules.cfg b/modules.cfg index 517111efe..56a2340e5 100644 --- a/modules.cfg +++ b/modules.cfg @@ -42,7 +42,7 @@ FONT_MODULES += type1 # CFF/OpenType font driver. # -# This driver needs the `sfnt', `pshinter', and `psnames' modules. +# This driver needs the `sfnt', `psaux', `pshinter', and `psnames' modules. FONT_MODULES += cff # Type 1 CID-keyed font driver. diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 069e904f5..e8479d48f 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -1595,7 +1595,8 @@ FT_Service_MultiMasters mm = (FT_Service_MultiMasters)face->mm; - mm->done_blend( FT_FACE( face ) ); + if (mm) + mm->done_blend( FT_FACE( face ) ); } #endif /* TT_CONFIG_OPTION_GX_VAR_SUPPORT */ |