diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2015-06-12 21:09:23 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2015-06-12 21:18:05 +0200 |
| commit | c660910d2043503f338fc254a2e1a33e747b4df1 (patch) | |
| tree | 903aaee332f63f3206ab3313c7ea3b895020cde5 /src/fontset.c | |
| parent | 00119c6cb6b33161bc593947aa0991caf9d7ad65 (diff) | |
| download | emacs-c660910d2043503f338fc254a2e1a33e747b4df1.tar.gz | |
Fix crash in fontset-info
* src/fontset.c (Ffontset_info): Check that the RFONT-DEF elt is
non-nil.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |