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

Avoid another segfault in 'face_at_buffer_position'

Browse source 
* src/xfaces.c (face_at_buffer_position): Make really sure the
default face is usable.  (Bug#53254)
This commit is contained in:
Eli Zaretskii 2022-01-14 16:11:34 +02:00
parent 281b878858
commit c05864dd25
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/xfaces.c
View file

@ -6425,8 +6425,12 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos,
default_face = FACE_FROM_ID_OR_NULL (f, face_id); default_face = FACE_FROM_ID_OR_NULL (f, face_id);
if (!default_face) if (!default_face)
default_face = FACE_FROM_ID (f, {
lookup_basic_face (w, f, DEFAULT_FACE_ID)); if (FRAME_FACE_CACHE (f)->used == 0)
recompute_basic_faces (f);
default_face = FACE_FROM_ID (f,
lookup_basic_face (w, f, DEFAULT_FACE_ID));
}
} }
/* Optimize common cases where we can use the default face. */ /* Optimize common cases where we can use the default face. */