Commit 1c0db158 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(ftfont_lookup_cache): Check the return value of FcFontList.

(ftfont_list): Likewise.
parent e0b6e3b9
2009-01-19 Kenichi Handa <handa@m17n.org>
* ftfont.c (ftfont_lookup_cache): Check the return value of
FcFontList.
(ftfont_list): Likewise.
2009-01-18 Juanma Barranquero <lekktu@gmail.com>
* dbusbind.c (Fdbus_register_signal):
......
......@@ -310,9 +310,10 @@ ftfont_lookup_cache (key, for_face)
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 @@ ftfont_list (frame, spec)
FcPatternAddString (pattern, FC_FAMILY, fam);
FcFontSetDestroy (fontset);
fontset = FcFontList (NULL, pattern, objset);
if (fontset->nfont > 0)
if (fontset && fontset->nfont > 0)
break;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment