From ca34504657f011c7faabf5bf7b4ce0e6d66caeae Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 16 Mar 2025 13:35:18 +0200 Subject: [PATCH] Avoid rare segfaults in 'combine_updates_for_frame' * src/xdisp.c (redisplay_internal): Don't add to 'tty_root_frames' frames that are not yet completely made. (Bug#77046) (cherry picked from commit 412a6fad98e768000dfe9538179889d6faeaa97a) --- src/xdisp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/xdisp.c b/src/xdisp.c index 89e8841d821..11cffce1cbe 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -17569,7 +17569,10 @@ redisplay_internal (void) if (is_tty_frame (f)) { /* Ignore all invisible tty frames, children or root. */ - if (!frame_redisplay_p (f)) + if (!frame_redisplay_p (f) + /* Ignore frames not yet completely made, which we + cannot safely redisplay. */ + || !f->after_make_frame) continue; /* Remember tty root frames which we've seen. */ -- 2.39.5