summaryrefslogtreecommitdiff
path: root/src/character.c
diff options
context:
space:
mode:
authorPhilipp Stephani <phst@google.com>2021-05-27 12:44:09 +0200
committerPhilipp Stephani <phst@google.com>2021-05-27 12:44:09 +0200
commit501296f994ba8b578d8a546eddfd2cdc365305f3 (patch)
treec3cf0f1e8315aa66b03d9b7e3b81c74142ed8625 /src/character.c
parentc82afdcc88442fcfb5ee076aef13dd9721a98192 (diff)
downloademacs-501296f994ba8b578d8a546eddfd2cdc365305f3.tar.gz
emacs-501296f994ba8b578d8a546eddfd2cdc365305f3.tar.bz2
emacs-501296f994ba8b578d8a546eddfd2cdc365305f3.zip
* src/character.c (lisp_string_width): Add missing type checks.
Diffstat (limited to 'src/character.c')
-rw-r--r--src/character.c12
1 files 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;