From 0ff75233c7b858085be78164a7482affa9e76664 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 30 Apr 2009 04:41:39 +0000 Subject: [PATCH] (fontset_find_font): Check if rfont_def is Qnil or not. --- src/fontset.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/fontset.c b/src/fontset.c index 3eb835401f2..bd9f719423a 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -547,8 +547,11 @@ fontset_find_font (fontset, c, face, id, fallback) 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) { -- 2.39.2