diff options
author | Eli Zaretskii <eliz@gnu.org> | 2019-07-01 19:25:52 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2019-07-01 19:25:52 +0300 |
commit | 50c98fdc0f9a7da65521fa1e4965e2f27b5557d8 (patch) | |
tree | 606538c796951d910e3e4fabe94b2d931fae7024 /src/fontset.c | |
parent | 6b7136a80db3cf85c187084c6aefac156cb8a388 (diff) | |
download | emacs-50c98fdc0f9a7da65521fa1e4965e2f27b5557d8.tar.gz emacs-50c98fdc0f9a7da65521fa1e4965e2f27b5557d8.tar.bz2 emacs-50c98fdc0f9a7da65521fa1e4965e2f27b5557d8.zip |
Fix assertion violations in fontset_find_font
* src/fontset.c (fontset_find_font): Don't assume REPERTORY
must be a fixnum.
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 2c45c95c3a2..137d2895932 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -575,7 +575,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, break; repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def)); - if (XFIXNUM (repertory) == charset_id) + if (FIXNUMP (repertory) && XFIXNUM_RAW (repertory) == charset_id) { charset_matched = i; break; |