pestctrl/emacs
1
0
Fork 0
forked from Github/emacs
Code Issues Pull requests Projects Releases Packages Wiki Activity

Work around sample server bug

Browse source 
* src/xterm.c (XTring_bell): Catch Access errors from XBell when
Emacs is running as an untrusted client.
This commit is contained in:
Po Lu 2022-12-06 19:30:15 +08:00
parent ccf3705892
commit f803203088
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/xterm.c
View file

@ -11251,21 +11251,32 @@ XTflash (struct frame *f)
static void
XTring_bell (struct frame *f)
{
if (FRAME_X_DISPLAY (f))
struct x_display_info *dpyinfo;
if (!FRAME_X_DISPLAY (f))
return;
dpyinfo = FRAME_DISPLAY_INFO (f);
if (visible_bell)
XTflash (f);
else
{
if (visible_bell)
XTflash (f);
else
{
block_input ();
/* When Emacs is untrusted, Bell requests sometimes generate
Access errors. This is not in the security extension
specification but seems to be a bug in the X consortium XKB
implementation. */
block_input ();
x_ignore_errors_for_next_request (dpyinfo);
#ifdef HAVE_XKB
XkbBell (FRAME_X_DISPLAY (f), None, 0, None);
XkbBell (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 0, None);
#else
XBell (FRAME_X_DISPLAY (f), 0);
XBell (FRAME_X_DISPLAY (f), 0);
#endif
XFlush (FRAME_X_DISPLAY (f));
unblock_input ();
}
XFlush (FRAME_X_DISPLAY (f));
x_stop_ignoring_errors (dpyinfo);
unblock_input ();
}
}