walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly order the FcConfigAddFontDir and FcConfigNormalizeFontDir calls to 

avoid crashes.
reviewed by: plam
This commit is contained in:
Patrick Lam 2006-01-18 15:41:15 +00:00
parent eadadf489a
commit 58bdd29619
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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):

4
src/fcdir.c
View File

@ -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,
return FcFalse; return FcFalse;
} }
FcConfigAddFontDir (config, dir);
tmpSet = FcFontSetCreate(); tmpSet = FcFontSetCreate();
if (!tmpSet) if (!tmpSet)
{ {