rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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.
This commit is contained in:
Ewald Hew 2017-10-16 11:48:31 +08:00
parent ccb0f7998d
commit 94f6d57a4c
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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.

2
modules.cfg
View File

@ -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.

3
src/cff/cffload.c
View File

@ -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 */