2 files changed, 10 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 472108f1a8c..09cd14012ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-23  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (font_add_log): Check the values of extra properties.
+
 2008-10-22  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (Fwindow_dedicated_p, Fset_window_dedicated_p):
diff --git a/src/font.c b/src/font.c
index a9ddd8353a5..5e09323cf63 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4810,13 +4810,16 @@ font_add_log (action, arg, result)
            tail = XCDR (tail))
         {
           elt = XCAR (tail);
-          if (EQ (XCAR (elt), QCscript))
+          if (EQ (XCAR (elt), QCscript)
+              && SYMBOLP (XCDR (elt)))
             val = concat3 (val, SYMBOL_NAME (QCscript),
                            concat2 (equalstr, SYMBOL_NAME (XCDR (elt))));
-          else if (EQ (XCAR (elt), QClang))
+          else if (EQ (XCAR (elt), QClang)
+                   && SYMBOLP (XCDR (elt)))
             val = concat3 (val, SYMBOL_NAME (QClang),
                            concat2 (equalstr, SYMBOL_NAME (XCDR (elt))));
-          else if (EQ (XCAR (elt), QCotf) && CONSP (XCDR (elt)))
+          else if (EQ (XCAR (elt), QCotf)
+                   && CONSP (XCDR (elt)) && SYMBOLP (XCAR (XCDR (elt))))
             val = concat3 (val, SYMBOL_NAME (QCotf),
                            concat2 (equalstr,
                                     SYMBOL_NAME (XCAR (XCDR (elt)))));