2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 223356eaad2..1b897b8403b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,8 @@
 2008-05-14  Kenichi Handa  <handa@m17n.org>
 
         * font.c (font_prop_validate): Make nil a valid value.
+        (font_clear_cache): Check if the cached vector of entities is nil
+        or not.
 
 2008-05-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
diff --git a/src/font.c b/src/font.c
index c5cf732bfe9..107426e6d6f 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2237,7 +2237,7 @@ font_clear_cache (f, cache, driver)
   for (tail = XCDR (XCDR (cache)); CONSP (tail); tail = XCDR (tail))
     {
       elt = XCAR (tail);
-      if (CONSP (elt) && FONT_SPEC_P (XCAR (elt)))
+      if (CONSP (elt) && FONT_SPEC_P (XCAR (elt)) && VECTORP (XCDR (elt)))
         {
           Lisp_Object vec = XCDR (elt);
           int i;