aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/src/fccfg.c2
-rw-r--r--fontconfig/src/fcmatch.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c
index b762376ae..7da50b50f 100644
--- a/fontconfig/src/fccfg.c
+++ b/fontconfig/src/fccfg.c
@@ -429,7 +429,7 @@ retry:
if (config == cfg)
return FcTrue;
- if (!config->fonts[FcSetSystem])
+ if (config && !config->fonts[FcSetSystem])
if (!FcConfigBuildFonts (config))
return FcFalse;
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c
index 23f985a6c..7993b81de 100644
--- a/fontconfig/src/fcmatch.c
+++ b/fontconfig/src/fcmatch.c
@@ -532,7 +532,10 @@ FcFontRenderPrepare (FcConfig *config,
{
pe = &FcPatternElts(pat)[i];
fe = FcPatternObjectFindElt (font, pe->object);
- if (!fe)
+ if (!fe &&
+ pe->object != FC_FAMILYLANG_OBJECT &&
+ pe->object != FC_STYLELANG_OBJECT &&
+ pe->object != FC_FULLNAMELANG_OBJECT)
{
FcPatternObjectListAdd (new, pe->object,
FcValueListDuplicate (FcPatternEltValues(pe)),