From c660910d2043503f338fc254a2e1a33e747b4df1 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 12 Jun 2015 21:09:23 +0200 Subject: [PATCH] Fix crash in fontset-info * src/fontset.c (Ffontset_info): Check that the RFONT-DEF elt is non-nil. --- src/fontset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fontset.c b/src/fontset.c index 97bdbcef5bf..5fc92feb130 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1983,7 +1983,7 @@ format is the same as above. */) for (j = 0; j < ASIZE (val); j++) { elt = AREF (val, j); - if (FONT_OBJECT_P (RFONT_DEF_OBJECT (elt))) + if (!NILP (elt) && FONT_OBJECT_P (RFONT_DEF_OBJECT (elt))) { Lisp_Object font_object = RFONT_DEF_OBJECT (elt); Lisp_Object slot, name; -- 2.39.5