walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a crash issue when empty strings are set to the BDF properties

This commit is contained in:
Akira TAGOH 2014-01-31 11:10:02 +09:00
parent e2b406053c
commit 80081555fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fcfreetype.c
View File

@ -1586,7 +1586,7 @@ FcFreeTypeQueryFace (const FT_Face face,
} }
if (width == -1 && if (width == -1 &&
FT_Get_BDF_Property (face, "SETWIDTH_NAME", &prop) == 0 && FT_Get_BDF_Property (face, "SETWIDTH_NAME", &prop) == 0 &&
prop.type == BDF_PROPERTY_TYPE_ATOM) prop.type == BDF_PROPERTY_TYPE_ATOM && prop.u.atom != NULL)
{ {
width = FcIsWidth ((FcChar8 *) prop.u.atom); width = FcIsWidth ((FcChar8 *) prop.u.atom);
if (FcDebug () & FC_DBG_SCANV) if (FcDebug () & FC_DBG_SCANV)
@ -1716,7 +1716,7 @@ bail3:
/* For PCF fonts, override the computed spacing with the one from /* For PCF fonts, override the computed spacing with the one from
the property */ the property */
if(FT_Get_BDF_Property(face, "SPACING", &prop) == 0 && if(FT_Get_BDF_Property(face, "SPACING", &prop) == 0 &&
prop.type == BDF_PROPERTY_TYPE_ATOM) { prop.type == BDF_PROPERTY_TYPE_ATOM && prop.u.atom != NULL) {
if(!strcmp(prop.u.atom, "c") || !strcmp(prop.u.atom, "C")) if(!strcmp(prop.u.atom, "c") || !strcmp(prop.u.atom, "C"))
spacing = FC_CHARCELL; spacing = FC_CHARCELL;
else if(!strcmp(prop.u.atom, "m") || !strcmp(prop.u.atom, "M")) else if(!strcmp(prop.u.atom, "m") || !strcmp(prop.u.atom, "M"))