From 65c5836108e3e35f10178f6b85aade14b9e8d887 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 30 Jan 2009 05:04:47 +0000 Subject: =?UTF-8?q?Bug=20569763=20=E2=80=93=20pango=20doesn't=20like=20fon?= =?UTF-8?q?t=20descriptions=20without=20family!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2009-01-30 Behdad Esfahbod Bug 569763 – pango doesn't like font descriptions without family! * pango/pangofc-fontmap.c (pango_fc_make_pattern): Don't crash is desc doesn't have family set. svn path=/trunk/; revision=2821 --- ChangeLog | 7 +++++++ pango/pangofc-fontmap.c | 12 +++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6aaec213..318b578b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-30 Behdad Esfahbod + + Bug 569763 – pango doesn't like font descriptions without family! + + * pango/pangofc-fontmap.c (pango_fc_make_pattern): Don't crash is desc + doesn't have family set. + 2009-01-29 Behdad Esfahbod * pango-view/viewer-render.c (make_layout), (get_options_string): diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index a302d4dd..11cb6762 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1353,13 +1353,15 @@ pango_fc_make_pattern (const PangoFontDescription *description, FC_PIXEL_SIZE, FcTypeDouble, pixel_size / 1024., NULL); - g_message ("'%s'", pango_font_description_get_family (description)); - families = g_strsplit (pango_font_description_get_family (description), ",", -1); + if (pango_font_description_get_family (description)) + { + families = g_strsplit (pango_font_description_get_family (description), ",", -1); - for (i = 0; families[i]; i++) - FcPatternAddString (pattern, FC_FAMILY, (FcChar8*) families[i]); + for (i = 0; families[i]; i++) + FcPatternAddString (pattern, FC_FAMILY, (FcChar8*) families[i]); - g_strfreev (families); + g_strfreev (families); + } if (language) FcPatternAddString (pattern, FC_LANG, (FcChar8 *) pango_language_to_string (language)); -- cgit v1.2.1