procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid crashes in --without-all build trying to scale non-ASCII char

Browse source 
* src/fontset.c (face_for_char): Display a non-ASCII character as
glyphless if the ASCII face has no fontset.  (Bug#63283)
This commit is contained in:
Eli Zaretskii 2023-05-09 08:20:57 +03:00
parent 387ddc0ccc
commit d94ea9efca
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/fontset.c
View file

@ -967,6 +967,15 @@ face_for_char (struct frame *f, struct face *face, int c,
#endif #endif
} }
/* If the parent face has no fontset we could work with, and has no
font, just return that same face, so that the caller will
consider the character to have no font capable of displaying it,
and display it as "glyphless". That is certainly better than
violating the assertion below or crashing when assertions are not
compiled in. */
if (face->fontset < 0 && !face->font)
return face->id;
eassert (fontset_id_valid_p (face->fontset)); eassert (fontset_id_valid_p (face->fontset));
fontset = FONTSET_FROM_ID (face->fontset); fontset = FONTSET_FROM_ID (face->fontset);
eassert (!BASE_FONTSET_P (fontset)); eassert (!BASE_FONTSET_P (fontset));