From 50c98fdc0f9a7da65521fa1e4965e2f27b5557d8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 1 Jul 2019 19:25:52 +0300 Subject: [PATCH] Fix assertion violations in fontset_find_font * src/fontset.c (fontset_find_font): Don't assume REPERTORY must be a fixnum. --- src/fontset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.39.2