Commit 4073203d authored by Patrick Lam's avatar Patrick Lam
Browse files

Don't crash on non-existant directories in global cache.

reviewed by: plam
parent f468f568
2006-01-26 Mike Fabian <mfabian@suse.de>
reviewed by: plam
* src/fcacache.c (FcGlobalCacheReadDir):
Don't crash on non-existant directories in global cache.
2006-01-26 Patirck Lam <plam@mit.edu>
* src/fccache.c (FcGlobalCacheSave, FcDirCacheWrite):
* src/fccfg.c (FcConfigAddFontDirSubdirs, FcConfigNormalizeFontDir):
......
......@@ -304,7 +304,9 @@ FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, con
if (cache->fd == -1)
return FcFalse;
dir = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)dir);
if (!(dir = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)dir)))
return FcFalse; /* non-existing directory */
for (d = cache->dirs; d; d = d->next)
{
if (strncmp (d->name, dir, strlen(dir)) == 0)
......
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