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

Avoid rare segfaults due to crazy creation of new child frames

Browse source 
* src/dispnew.c (combine_updates, combine_updates_for_frame): Skip
frames and child frames that were not yet completely made.
(Bug#77046)
This commit is contained in:
Eli Zaretskii 2025-03-22 21:32:16 +02:00
parent 25d7575358
commit 62368f93a5
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dispnew.c
View file

@ -4018,6 +4018,9 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
{
struct frame *root = root_frame (f);
if (!root->after_make_frame)
return;
/* Determine visible frames on the root frame, including the root
frame itself. Note that there are cases, see bug#75056, where we
can be called for invisible frames. This looks like a bug with
@ -4036,7 +4039,8 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
for (Lisp_Object tail = XCDR (z_order); CONSP (tail); tail = XCDR (tail))
{
topmost_child = XFRAME (XCAR (tail));
copy_child_glyphs (root, topmost_child);
if (topmost_child->after_make_frame)
copy_child_glyphs (root, topmost_child);
}
update_begin (root);
@ -4089,7 +4093,8 @@ combine_updates (Lisp_Object roots)
for (; CONSP (roots); roots = XCDR (roots))
{
struct frame *root = XFRAME (XCAR (roots));
combine_updates_for_frame (root, false);
if (root->after_make_frame)
combine_updates_for_frame (root, false);
}
}