andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a crash in 'merge_face_ref'

Browse source 
* src/xfaces.c (get_lface_attributes): Avoid crashes if F is NULL.
This happens when 'face_inheritance_cycle' is for some reason
called for the default attributes of a face (which are applicable
to future frames).  We avoid the crashes by not consulting face
remapping in that case, since face remapping is buffer-local, and
therefore cannot possibly affect face defaults.  (Bug#79790)
This commit is contained in:
Eli Zaretskii 2025-11-09 08:58:15 +02:00
parent 266335374e
commit f11349ea1a
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/xfaces.c
View file

@ -2125,25 +2125,31 @@ get_lface_attributes (struct window *w,
face_name = resolve_face_name (face_name, signal_p);
/* See if SYMBOL has been remapped to some other face (usually this
is done buffer-locally). */
face_remapping = assq_no_quit (face_name, Vface_remapping_alist);
if (CONSP (face_remapping))
/* See if SYMBOL has been remapped to some other face (usually this is
done buffer-locally). We only do that of F is non-NULL, because
face remapping is not relevant for default attributes of faces for
future frames, and because merge_face_ref cannot handle NULL frames
anyway. */
if (f)
{
struct named_merge_point named_merge_point;
if (push_named_merge_point (&named_merge_point,
face_name, NAMED_MERGE_POINT_REMAP,
&named_merge_points))
face_remapping = assq_no_quit (face_name, Vface_remapping_alist);
if (CONSP (face_remapping))
{
int i;
struct named_merge_point named_merge_point;
for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
attrs[i] = Qunspecified;
if (push_named_merge_point (&named_merge_point,
face_name, NAMED_MERGE_POINT_REMAP,
&named_merge_points))
{
int i;
return merge_face_ref (w, f, XCDR (face_remapping), attrs,
signal_p, named_merge_points,
0);
for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
attrs[i] = Qunspecified;
return merge_face_ref (w, f, XCDR (face_remapping), attrs,
signal_p, named_merge_points,
0);
}
}
}