changeset 103112:35792077cc20

(fontset_find_font): Check if rfont_def is Qnil or not.
author Kenichi Handa <handa@m17n.org>
date Thu, 30 Apr 2009 04:41:39 +0000
parents 138b39938198
children 9e5db9760121
files src/fontset.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontset.c	Wed Apr 29 19:55:49 2009 +0000
+++ b/src/fontset.c	Thu Apr 30 04:41:39 2009 +0000
@@ -547,8 +547,11 @@
 	for (i = 0; i < ASIZE (vec); i++)
 	  {
 	    Lisp_Object rfont_def = AREF (vec, i);
-	    Lisp_Object repertory
-	      = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
+	    Lisp_Object repertory;
+
+	    if (NILP (rfont_def))
+	      break;
+	    repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
 
 	    if (XINT (repertory) == id)
 	      {