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

Prevent crashes caused by invalid locale coding systems

Browse source 
* src/xterm.c (handle_one_xevent): Prevent a signal inside
`setup_coding_system' which crashes recent versions of GLib if
the locale coding system is invalid.

Do not merge to master.
This commit is contained in:
Po Lu 2022-02-17 15:35:41 +08:00
parent c8442df581
commit b30ef09919
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/xterm.c
View file

@ -8739,6 +8739,15 @@ handle_one_xevent (struct x_display_info *dpyinfo,
{
/* Decode the input data. */
#ifdef HAVE_GLIB
/* If this isn't done in a build with GLib (usually
with GTK), then the resulting signal in
`setup_coding_system' will cause Emacs to
crash. */
if (NILP (Fcoding_system_p (coding_system)))
coding_system = Qraw_text;
#endif
/* The input should be decoded with `coding_system'
which depends on which X*LookupString function
we used just above and the locale. */