[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcfreetype.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80081555fdffea927a53fce2773cfbe9db4c51f0
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jan 31 11:10:02 2014 +0900

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

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index e394307..d271d69 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1586,7 +1586,7 @@ FcFreeTypeQueryFace (const FT_Face  face,
 	}
 	if (width == -1 &&
 	    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);
 	    if (FcDebug () & FC_DBG_SCANV)
@@ -1716,7 +1716,7 @@ bail3:
     /* For PCF fonts, override the computed spacing with the one from
        the property */
     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"))
             spacing = FC_CHARCELL;
         else if(!strcmp(prop.u.atom, "m") || !strcmp(prop.u.atom, "M"))