Mercurial > emacs
changeset 101284:4c2b48d0a379
(ftfont_lookup_cache): Check the return value of FcFontList.
(ftfont_list): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 19 Jan 2009 12:07:32 +0000 |
| parents | dc4bcae2bbbc |
| children | dc37f02f359b |
| files | src/ftfont.c |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ftfont.c Mon Jan 19 06:52:50 2009 +0000 +++ b/src/ftfont.c Mon Jan 19 12:07:32 2009 +0000 @@ -310,9 +310,10 @@ FC_INDEX, FcTypeInteger, index, NULL); objset = FcObjectSetBuild (FC_CHARSET, NULL); fontset = FcFontList (NULL, pat, objset); - xassert (fontset && fontset->nfont > 0); - if (FcPatternGetCharSet (fontset->fonts[0], FC_CHARSET, 0, &charset) - == FcResultMatch) + if (fontset && fontset->nfont > 0 + && (FcPatternGetCharSet (fontset->fonts[0], FC_CHARSET, 0, + &charset) + == FcResultMatch)) cache_data->fc_charset = FcCharSetCopy (charset); else cache_data->fc_charset = FcCharSetCreate (); @@ -835,7 +836,7 @@ FcPatternAddString (pattern, FC_FAMILY, fam); FcFontSetDestroy (fontset); fontset = FcFontList (NULL, pattern, objset); - if (fontset->nfont > 0) + if (fontset && fontset->nfont > 0) break; } }