Commit 58bdd296 authored by Patrick Lam's avatar Patrick Lam
Browse files

Properly order the FcConfigAddFontDir and FcConfigNormalizeFontDir calls to

    avoid crashes.
reviewed by: plam
parent eadadf48
2006-01-18 Mike Fabian <mfabian@suse.de>
reviewed by: plam
* src/fcdir.c (FcDirScanConfig):
Properly order the FcConfigAddFontDir and FcConfigNormalizeFontDir
calls to avoid crashes.
2006-01-14 Patirck Lam <plam@mit.edu> 2006-01-14 Patirck Lam <plam@mit.edu>
* src/fccache.c (FcDirCacheConsume): * src/fccache.c (FcDirCacheConsume):
......
...@@ -131,6 +131,9 @@ FcDirScanConfig (FcFontSet *set, ...@@ -131,6 +131,9 @@ FcDirScanConfig (FcFontSet *set,
if (config && !FcConfigAcceptFilename (config, dir)) if (config && !FcConfigAcceptFilename (config, dir))
return FcTrue; return FcTrue;
if (config)
FcConfigAddFontDir (config, dir);
if (!force) if (!force)
{ {
/* /*
...@@ -165,7 +168,6 @@ FcDirScanConfig (FcFontSet *set, ...@@ -165,7 +168,6 @@ FcDirScanConfig (FcFontSet *set,
return FcFalse; return FcFalse;
} }
FcConfigAddFontDir (config, dir);
tmpSet = FcFontSetCreate(); tmpSet = FcFontSetCreate();
if (!tmpSet) if (!tmpSet)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment