[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 src/fcmatch.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f8e22fd6469cd14fe13ba657b5c5b66a884b614d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Dec 20 12:21:20 2017 -0500

    Put back accidentally removed code

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 22c3784..62f8e58 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -692,6 +692,8 @@ FcFontRenderPrepare (FcConfig	    *config,
 		if (!l)
 		    goto bail0;
 		dir = FcStrDirname (FcValueString (&l->value));
+		if (!config)
+		    config = FcConfigGetCurrent ();
 		if (config && FcHashTableFind (config->alias_table, dir, (void **) &alias))
 		{
 		    FcChar8 *base = FcStrBasename (FcValueString (&l->value));