From: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri, 12 Jun 2015 19:09:23 +0000 (+0200)
Subject: Fix crash in fontset-info
X-Git-Tag: emacs-25.0.90~1789
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c660910d2043503f338fc254a2e1a33e747b4df1;p=emacs.git

Fix crash in fontset-info

* src/fontset.c (Ffontset_info): Check that the RFONT-DEF elt is
non-nil.
---

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;