masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-18 18:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid crashes when ':eval' deletes our frame

Browse source 
* src/xdisp.c (display_mode_element): Signal an error if
':eval' somehow deletes the frame whose window we are
redisplaying. (Bug#29726)
This commit is contained in:
Eli Zaretskii 2017-12-23 13:59:07 +02:00
parent 9105c9aa34
commit 720ed0b533
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/xdisp.c
View file

@ -23685,6 +23685,14 @@ display_mode_element (struct it *it, int depth, int field_width, int precision,
{ {
Lisp_Object spec; Lisp_Object spec;
spec = safe__eval (true, XCAR (XCDR (elt))); spec = safe__eval (true, XCAR (XCDR (elt)));
/* The :eval form could delete the frame stored in the
iterator, which will cause a crash if we try to
access faces and other fields (e.g., FRAME_KBOARD)
on that frame. This is a nonsensical thing to do,
and signaling an error from redisplay might be
dangerous, but we cannot continue with an invalid frame. */
if (!FRAME_LIVE_P (it->f))
signal_error (":eval deleted the frame being displayed", elt);
n += display_mode_element (it, depth, field_width - n, n += display_mode_element (it, depth, field_width - n,
precision - n, spec, props, precision - n, spec, props,
risky); risky);