diff options
| -rw-r--r-- | src/macfont.m | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/macfont.m b/src/macfont.m index 7f153e13045..c9321a7d22e 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -2070,7 +2070,7 @@ macfont_supports_charset_and_languages_p (CTFontDescriptorRef desc, ptrdiff_t j; for (j = 0; j < ASIZE (chars); j++) - if (TYPE_RANGED_INTEGERP (UTF32Char, AREF (chars, j)) + if (RANGED_INTEGERP (0, AREF (chars, j), MAX_UNICODE_CHAR) && CFCharacterSetIsLongCharacterMember (desc_charset, XFASTINT (AREF (chars, j)))) break; @@ -2705,6 +2705,9 @@ macfont_has_char (Lisp_Object font, int c) int result; CFCharacterSetRef charset; + if (c < 0 || c > MAX_UNICODE_CHAR) + return false; + block_input (); if (FONT_ENTITY_P (font)) { |