Properly order the FcConfigAddFontDir and FcConfigNormalizeFontDir calls to
avoid crashes. reviewed by: plam
This commit is contained in:
parent
eadadf489a
commit
58bdd29619
|
@ -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>
|
||||
* src/fccache.c (FcDirCacheConsume):
|
||||
|
||||
|
|
|
@ -131,6 +131,9 @@ FcDirScanConfig (FcFontSet *set,
|
|||
if (config && !FcConfigAcceptFilename (config, dir))
|
||||
return FcTrue;
|
||||
|
||||
if (config)
|
||||
FcConfigAddFontDir (config, dir);
|
||||
|
||||
if (!force)
|
||||
{
|
||||
/*
|
||||
|
@ -165,7 +168,6 @@ FcDirScanConfig (FcFontSet *set,
|
|||
return FcFalse;
|
||||
}
|
||||
|
||||
FcConfigAddFontDir (config, dir);
|
||||
tmpSet = FcFontSetCreate();
|
||||
if (!tmpSet)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue