ftfont.c (get_adstyle_property): If the font is not BDF nor PCF, return Qnil (Bug#8046, Bug#10193).

2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 69e3eda2630..d897fadd292 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2011-12-05  Kenichi Handa  <handa@m17n.org>
 
+        * ftfont.c (get_adstyle_property): If the font is not BDF nor PCF,
+        return Qnil (Bug#8046, Bug#10193).
+
+2011-12-05  Kenichi Handa  <handa@m17n.org>
+
         * coding.c (encode_designation_at_bol): New args charbuf_end and
         dst.  Return the number of produced bytes.  Callers changed.
         (coding_set_source): Return how many bytes coding->source was
diff --git a/src/ftfont.c b/src/ftfont.c
index c48346b0147..ec1a4ca6a78 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -164,6 +164,13 @@ get_adstyle_property (FcPattern *p)
   char *str, *end;
   Lisp_Object adstyle;
 
+#ifdef FC_FONTFORMAT
+  if ((FcPatternGetString (p, FC_FONTFORMAT, 0, &fcstr) == FcResultMatch)
+      && (xstrcasecmp ((char *) fcstr, "bdf") != 0
+          || xstrcasecmp ((char *) fcstr, "pcf") != 0))
+    /* Not a BDF nor PCF font.  */
+    return Qnil;
+#endif
   if (FcPatternGetString (p, FC_STYLE, 0, &fcstr) != FcResultMatch)
     return Qnil;
   str = (char *) fcstr;