[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 src/fccfg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdf1581e3de5528f397f19bfd4ca9caaf9e7fe4a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Mar 8 05:53:27 2013 -0500

    Fix crash with FcConfigSetCurrent(NULL)

diff --git a/src/fccfg.c b/src/fccfg.c
index b762376..7da50b5 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -429,7 +429,7 @@ retry:
     if (config == cfg)
 	return FcTrue;
 
-    if (!config->fonts[FcSetSystem])
+    if (config && !config->fonts[FcSetSystem])
 	if (!FcConfigBuildFonts (config))
 	    return FcFalse;