diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | pango/pangoatsui-fontmap.c | 3 |
2 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2006-07-17 Richard Hult <richard@imendio.com> + + Bug 347021 – atsui crash when a matching font cannot be found. + Patch from Brian Tarricone. + + * pango/pangoatsui-fontmap.c (pango_atsui_font_map_load_font): + Bail out if best desc or best face isn't found. + 2006-07-10 Behdad Esfahbod <behdad@gnome.org> * === Released 1.13.3 === diff --git a/pango/pangoatsui-fontmap.c b/pango/pangoatsui-fontmap.c index 52662978..059731da 100644 --- a/pango/pangoatsui-fontmap.c +++ b/pango/pangoatsui-fontmap.c @@ -578,6 +578,9 @@ pango_atsui_font_map_load_font (PangoFontMap *fontmap, } } + if (best_desc == NULL || best_face == NULL) + return NULL; + pango_font_description_set_size (best_desc, size); best_font = pango_atsui_font_map_lookup (atsuifontmap, context, best_desc, best_face->postscript_name); |