Move FcConfigNormalizeFontDir call so that it doesn't result in infinite

    recursion (reported by Ronny V. Vindenes).

1 files changed, 5 insertions, 1 deletions

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 4900e45..2d6c2c3 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -112,7 +112,7 @@ static int
 scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool verbose)
 {
     int		ret = 0;
-    FcChar8	*dir;
+    const FcChar8 *dir;
     FcFontSet	*set;
     FcStrSet	*subdirs;
     FcStrList	*sublist;
@@ -124,6 +124,10 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
      */
     while ((dir = FcStrListNext (list)))
     {
+	dir = FcConfigNormalizeFontDir (config, dir);
+	if (!dir)
+	    return FcFalse;
+
 	if (verbose)
 	{
 	    printf ("%s: \"%s\": ", program, dir);