mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Avoid infloop in redisplay due to faulty mode-line properties

Browse Source 
* xdisp.c (safe_set_text_properties): New function.
(display_mode_element): Call Fset_text_properties through
internal_condition_case_n, using safe_set_text_properties as a
wrapper.  (Bug#32038)
This commit is contained in:
Jonathan Kyle Mitchell 2018-07-04 22:38:29 -05:00 committed by Eli Zaretskii
parent 41f5de7c8a
commit 9f25231f35
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/xdisp.c
View File

@ -23516,6 +23516,17 @@ move_elt_to_front (Lisp_Object elt, Lisp_Object list)
return list;
}
/* Subroutine to call Fset_text_properties through
internal_condition_case_n. ARGS are the arguments of
Fset_text_properties, in order. */
static Lisp_Object
safe_set_text_properties (ptrdiff_t nargs, Lisp_Object *args)
{
eassert (nargs == 4);
return Fset_text_properties (args[0], args[1], args[2], args[3]);
}
/* Contribute ELT to the mode line for window IT->w. How it
translates into text depends on its data type.
@ -23610,8 +23621,17 @@ display_mode_element (struct it *it, int depth, int field_width, int precision,
= Fdelq (aelt, mode_line_proptrans_alist);
elt = Fcopy_sequence (elt);
Fset_text_properties (make_number (0), Flength (elt),
props, elt);
/* PROPS might cause set-text-properties to signal
an error, so we call it via internal_condition_case_n,
to avoid an infloop in redisplay due to the error. */
internal_condition_case_n (safe_set_text_properties,
4,
((Lisp_Object [])
{make_number (0),
Flength (elt),
props,
elt}),
Qt, safe_eval_handler);
/* Add this item to mode_line_proptrans_alist. */
mode_line_proptrans_alist
= Fcons (Fcons (elt, props),