[Emacs-diffs] master c660910: Fix crash in fontset-info

[Andreas Schwab]

branch: master
commit c660910d2043503f338fc254a2e1a33e747b4df1
Author: Andreas Schwab <address@hidden>
Commit: Andreas Schwab <address@hidden>

    Fix crash in fontset-info
    
    * src/fontset.c (Ffontset_info): Check that the RFONT-DEF elt is
    non-nil.
---
 src/fontset.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/fontset.c b/src/fontset.c
index 97bdbce..5fc92fe 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;