diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-10-25 02:27:18 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-10-25 02:27:18 +0000 |
| commit | 135d6852153c4d8844d077ee61ec98c5595a9782 (patch) | |
| tree | 8cb22da94d97e9630fc77d43dce3e2a2150af35e | |
| parent | d334ff1f89a51dde4ce96d7acac2c218be7d7ed5 (diff) | |
| parent | b8ea73664563bd6c83ce4684402c62e10942981e (diff) | |
| download | pango-135d6852153c4d8844d077ee61ec98c5595a9782.tar.gz | |
Merge branch 'font-format-crash' into 'master'
fc: Be robust against missing format information
Closes #431
See merge request GNOME/pango!151
| -rw-r--r-- | pango/pangofc-fontmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index c7193941..2df9d16c 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -835,8 +835,7 @@ filter_fontset_by_format (FcFontSet *fontset) const char *s; res = FcPatternGetString (fontset->fonts[i], FC_FONTFORMAT, 0, (FcChar8 **)(void*)&s); - g_assert (res == FcResultMatch); - if (pango_fc_is_supported_font_format (s)) + if (res == FcResultMatch && pango_fc_is_supported_font_format (s)) FcFontSetAdd (result, FcPatternDuplicate (fontset->fonts[i])); } |