From 8b413bb62c6743db10e7d210fb7924c9502fd60e Mon Sep 17 00:00:00 2001 From: Patrick Lam Date: Tue, 7 Feb 2006 02:22:50 +0000 Subject: [PATCH] Takashi Iwai Don't loop infinitely on recursive symlinks (client-side). --- ChangeLog | 7 +++++++ src/fccache.c | 21 +++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bb6832..8378d5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-06 Patrick Lam + Takashi Iwai + + * src/fccache.c (FcCacheReadDirs, FcCacheRead): + + Don't loop infinitely on recursive symlinks (client-side). + 2006-02-06 Takashi Iwai reviewed by: plam * fc-cache/fc-cache.c (scanDirs, main): diff --git a/src/fccache.c b/src/fccache.c index e836474..f2a41d4 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -863,7 +863,7 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config) static int FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache, - FcStrList *list, FcFontSet * set) + FcStrList *list, FcFontSet * set, FcStrSet *processed_dirs) { int ret = 0; FcChar8 *dir; @@ -887,9 +887,9 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache, name = FcConfigNormalizeFontDir (config, dir); if (name) { - if ((d = FcGlobalCacheDirFind (cache, (const char *)name)) != NULL && - d->state == FcGCDirUpdated) + if (FcStrSetMember (processed_dirs, dir)) continue; + FcStrSetAdd (processed_dirs, dir); } subdirs = FcStrSetCreate (); @@ -955,7 +955,7 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache, ret++; continue; } - ret += FcCacheReadDirs (config, cache, sublist, set); + ret += FcCacheReadDirs (config, cache, sublist, set, processed_dirs); } FcStrListDone (list); return ret; @@ -964,15 +964,24 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache, FcFontSet * FcCacheRead (FcConfig *config, FcGlobalCache * cache) { - FcFontSet * s = FcFontSetCreate(); + FcFontSet *s = FcFontSetCreate(); + FcStrSet *processed_dirs; + if (!s) return 0; - if (FcCacheReadDirs (config, cache, FcConfigGetConfigDirs (config), s)) + processed_dirs = FcStrSetCreate(); + if (!processed_dirs) goto bail; + if (FcCacheReadDirs (config, cache, FcConfigGetConfigDirs (config), s, processed_dirs)) + goto bail1; + + FcStrSetDestroy (processed_dirs); return s; + bail1: + FcStrSetDestroy (processed_dirs); bail: FcFontSetDestroy (s); return 0; -- 2.39.2