From 603e22790a2eb5c6a4376496696008f96bdb9be4 Mon Sep 17 00:00:00 2001
From: altermo <107814000+altermo@users.noreply.github.com>
Date: Wed, 27 Nov 2024 10:37:28 +0100
Subject: [PATCH] Add more error-checking to Fmap_charset_chars

* src/charset.c (Fmap_charset_chars): Signal an error if FROM_CODE
or TO_CODE is non-nil and not a fixnum.  (Bug#74555)

Copyright-paperwork-exempt: yes
(cherry picked from commit 2125e188ad806134dfc81408822208d75d7f3b5a)
---
 src/charset.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/charset.c b/src/charset.c
index f7d80cc3f3e..37d08f249c7 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -819,6 +819,7 @@ TO-CODE, which are CHARSET code points.  */)
     from = CHARSET_MIN_CODE (cs);
   else
     {
+      CHECK_FIXNAT(from_code);
       from = XFIXNUM (from_code);
       if (from < CHARSET_MIN_CODE (cs))
 	from = CHARSET_MIN_CODE (cs);
@@ -827,6 +828,7 @@ TO-CODE, which are CHARSET code points.  */)
     to = CHARSET_MAX_CODE (cs);
   else
     {
+      CHECK_FIXNAT(to_code);
       to = XFIXNUM (to_code);
       if (to > CHARSET_MAX_CODE (cs))
 	to = CHARSET_MAX_CODE (cs);
-- 
2.39.5