From 339c83e11e77fdc53c860f467bd59840cf9645d1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 26 Jun 2003 00:39:56 +0000 Subject: [PATCH] Allow config->cache to be null (as it is when $HOME is not set) (2.2 branch) --- src/fccfg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/fccfg.c b/src/fccfg.c index 36a76a4..8d32db8 100644 --- a/src/fccfg.c +++ b/src/fccfg.c @@ -160,7 +160,8 @@ FcConfigDestroy (FcConfig *config) FcStrSetDestroy (config->fontDirs); FcStrSetDestroy (config->configFiles); - FcStrFree (config->cache); + if (config->cache) + FcStrFree (config->cache); FcSubstDestroy (config->substPattern); FcSubstDestroy (config->substFont); @@ -193,7 +194,8 @@ FcConfigBuildFonts (FcConfig *config) if (!cache) goto bail1; - FcGlobalCacheLoad (cache, config->cache); + if (config->cache) + FcGlobalCacheLoad (cache, config->cache); list = FcConfigGetFontDirs (config); if (!list) @@ -211,7 +213,8 @@ FcConfigBuildFonts (FcConfig *config) if (FcDebug () & FC_DBG_FONTSET) FcFontSetPrint (fonts); - FcGlobalCacheSave (cache, config->cache); + if (config->cache) + FcGlobalCacheSave (cache, config->cache); FcGlobalCacheDestroy (cache); FcConfigSetFonts (config, fonts, FcSetSystem); -- 2.39.2