diff options
| author | Andreas Schwab | 2015-06-12 21:09:23 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2015-06-12 21:18:05 +0200 |
| commit | c660910d2043503f338fc254a2e1a33e747b4df1 (patch) | |
| tree | 903aaee332f63f3206ab3313c7ea3b895020cde5 /src | |
| parent | 00119c6cb6b33161bc593947aa0991caf9d7ad65 (diff) | |
| download | emacs-c660910d2043503f338fc254a2e1a33e747b4df1.tar.gz emacs-c660910d2043503f338fc254a2e1a33e747b4df1.zip | |
Fix crash in fontset-info
* src/fontset.c (Ffontset_info): Check that the RFONT-DEF elt is
non-nil.
Diffstat (limited to 'src')
| -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. */) | |||
| 1983 | for (j = 0; j < ASIZE (val); j++) | 1983 | for (j = 0; j < ASIZE (val); j++) |
| 1984 | { | 1984 | { |
| 1985 | elt = AREF (val, j); | 1985 | elt = AREF (val, j); |
| 1986 | if (FONT_OBJECT_P (RFONT_DEF_OBJECT (elt))) | 1986 | if (!NILP (elt) && FONT_OBJECT_P (RFONT_DEF_OBJECT (elt))) |
| 1987 | { | 1987 | { |
| 1988 | Lisp_Object font_object = RFONT_DEF_OBJECT (elt); | 1988 | Lisp_Object font_object = RFONT_DEF_OBJECT (elt); |
| 1989 | Lisp_Object slot, name; | 1989 | Lisp_Object slot, name; |