summaryrefslogtreecommitdiff
path: root/pango/pangofc-fontmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'pango/pangofc-fontmap.c')
-rw-r--r--pango/pangofc-fontmap.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 8b395987..654edbe2 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -850,12 +850,6 @@ pango_fc_font_map_new_font (PangoFontMap *fontmap,
PangoFcFont *fcfont;
GSList *l;
- /* Returning NULL here actually violates a contract
- * that loading load_font() will never return NULL.
- * We probably should actually create a dummy
- * font that doesn't draw anything and has empty
- * metrics.
- */
if (priv->closed)
return NULL;
@@ -904,6 +898,9 @@ pango_fc_font_map_new_font (PangoFontMap *fontmap,
FcPatternDestroy (pattern);
}
+ if (!fcfont)
+ return NULL;
+
pango_fc_font_map_add (fcfontmap, context, fcfont);
/*