[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit f4a2a1e577f6d6fe40469fb0ab68eb0b5f42465c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Oct 11 17:26:52 2017 +0200

    Remove assert

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 8cee5a7..23138a9 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -2109,7 +2109,8 @@ FcFreeTypeQueryAll(const FcChar8	*file,
     if (num_instances && (!index_set || instance_num))
     {
 	FT_Get_MM_Var (face, &mm_var);
-	assert (mm_var);
+	if (!mm_var)
+	  num_instances = 0;
     }
 
     if (count)