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

Make timer_check even more resilient

Browse source 
* src/keyboard.c (timer_check): Inhibit atimers while making the
copy of the timer list (bug#21380).  This prevents an extremely
unlikely segfault.
This commit is contained in:
Pip Cet 2022-04-29 14:14:19 +02:00 • committed by Lars Ingebrigtsen
parent 1b71c995da
commit fa52782f5c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/keyboard.c
View file

@ -4633,6 +4633,8 @@ timer_check (void)
Lisp_Object tem = Vinhibit_quit;
Vinhibit_quit = Qt;
block_input ();
turn_on_atimers (false);
/* We use copies of the timers' lists to allow a timer to add itself
again, without locking up Emacs if the newly added timer is
@ -4646,6 +4648,8 @@ timer_check (void)
else
idle_timers = Qnil;
turn_on_atimers (true);
unblock_input ();
Vinhibit_quit = tem;
do