From 501296f994ba8b578d8a546eddfd2cdc365305f3 Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Thu, 27 May 2021 12:44:09 +0200 Subject: [PATCH] * src/character.c (lisp_string_width): Add missing type checks. --- src/character.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/character.c b/src/character.c index 5753e883c32..b16c9fd6b8b 100644 --- a/src/character.c +++ b/src/character.c @@ -394,10 +394,14 @@ lisp_string_width (Lisp_Object string, ptrdiff_t from, ptrdiff_t to, SBYTES (default_font)))) { Lisp_Object font_info = Ffont_info (default_font, Qnil); - font_width = AREF (font_info, 11); - if (font_info <= 0) - font_width = AREF (font_info, 10); - } + font_width + = check_integer_range (AREF (font_info, 11), + INT_MIN, INT_MAX); + if (font_width <= 0) + font_width + = check_integer_range (AREF (font_info, 10), + INT_MIN, INT_MAX); + } } thiswidth = (double) pixelwidth / font_width + 0.5; chars = end - i; -- 2.39.5