unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: martin rudalics <rudalics@gmx.at>
To: Michael Welsh Duggan <mwd@cert.org>
Cc: "mwd@md5i.com" <mwd@md5i.com>,
	"schwab@linux-m68k.org" <schwab@linux-m68k.org>,
	"47244@debbugs.gnu.org" <47244@debbugs.gnu.org>
Subject: bug#47244: 28.0.50; SIGSEGV in long-runnning Emacs
Date: Wed, 31 Mar 2021 17:49:40 +0200	[thread overview]
Message-ID: <dfd90ddc-2c42-f5e3-8681-ec72cc87fa52@gmx.at> (raw)
In-Reply-To: <y2tdefzgyjpef8.fsf@lx-birch.ad.sei.cmu.edu>

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

 > b->window_count is 1.

What else should I have expected?  I attach yet another diff.  When the
same assertion triggers we'll at least know which buffer got killed.

martin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: selected_window_contents.diff --]
[-- Type: text/x-patch; name="selected_window_contents.diff", Size: 6925 bytes --]

diff --git a/src/buffer.c b/src/buffer.c
index 8e33162989..70b37e61a2 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1951,6 +1951,9 @@ DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ",
      This gets rid of them for certain.  */
   reset_buffer_local_variables (b, 1);
 
+  if (!b->base_buffer)
+    eassert (b->window_count == 0);
+
   bset_name (b, Qnil);
 
   block_input ();
@@ -1991,6 +1994,8 @@ DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ",
 
   run_buffer_list_update_hook (b);
 
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
+
   return Qt;
 }
 \f
@@ -2151,6 +2156,9 @@ set_buffer_internal_1 (register struct buffer *b)
 
   BUFFER_CHECK_INDIRECTION (b);
 
+  if (!BUFFER_LIVE_P (b))
+    error ("Selecting deleted buffer");
+
   old_buf = current_buffer;
   current_buffer = b;
   last_known_column_point = -1;   /* Invalidate indentation cache.  */
diff --git a/src/window.c b/src/window.c
index eb16e2a433..baf9ed2d90 100644
--- a/src/window.c
+++ b/src/window.c
@@ -307,7 +307,11 @@ wset_buffer (struct window *w, Lisp_Object val)
   if (BUFFERP (val))
     /* Make sure that we do not assign the buffer
        to an internal window.  */
-    eassert (MARKERP (w->start) && MARKERP (w->pointm));
+    {
+      eassert (BUFFER_LIVE_P (XBUFFER (val)));
+      eassert (MARKERP (w->start) && MARKERP (w->pointm));
+    }
+
   w->contents = val;
   adjust_window_count (w, 1);
 }
@@ -315,6 +319,7 @@ wset_buffer (struct window *w, Lisp_Object val)
 static void
 wset_old_buffer (struct window *w, Lisp_Object val)
 {
+  eassert (BUFFER_LIVE_P (XBUFFER (val)));
   w->old_buffer = val;
 }
 
@@ -594,6 +599,8 @@ select_window_1 (Lisp_Object window, bool inhibit_point_swap)
 
   selected_window = window;
 
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
+
   /* Go to the point recorded in the window.
      This is important when the buffer is in more
      than one window.  It also matters when
@@ -2950,6 +2957,8 @@ DEFUN ("window-list-1", Fwindow_list_1, Swindow_list_1, 0, 3, 0,
   CHECK_ALL_WINDOWS                 /* Arg is ignored */
 };
 
+static int replace_buffer_in_windows_safely_count;
+
 static Lisp_Object
 window_loop (enum window_loop type, Lisp_Object obj, bool mini,
 	     Lisp_Object frames)
@@ -3048,6 +3057,8 @@ window_loop (enum window_loop type, Lisp_Object obj, bool mini,
 		if (EQ (window, selected_window)
 		    && XBUFFER (w->contents) == current_buffer)
 		  Fset_buffer (w->contents);
+
+		replace_buffer_in_windows_safely_count += 1;
 	      }
 	    break;
 
@@ -3411,6 +3422,8 @@ DEFUN ("delete-other-windows-internal", Fdelete_other_windows_internal,
 replace_buffer_in_windows (Lisp_Object buffer)
 {
   call1 (Qreplace_buffer_in_windows, buffer);
+
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
 }
 
 /* If BUFFER is shown in a window, safely replace it with some other
@@ -3419,6 +3432,10 @@ replace_buffer_in_windows (Lisp_Object buffer)
 void
 replace_buffer_in_windows_safely (Lisp_Object buffer)
 {
+  int count = buffer_window_count (XBUFFER (buffer));
+
+  replace_buffer_in_windows_safely_count = 0;
+
   if (buffer_window_count (XBUFFER (buffer)))
     {
       Lisp_Object tail, frame;
@@ -3429,6 +3446,8 @@ replace_buffer_in_windows_safely (Lisp_Object buffer)
       FOR_EACH_FRAME (tail, frame)
 	window_loop (REPLACE_BUFFER_IN_WINDOWS_SAFELY, buffer, true, frame);
     }
+
+  eassert (count == replace_buffer_in_windows_safely_count);
 }
 \f
 /* The following three routines are needed for running a window's
@@ -3960,6 +3979,8 @@ run_window_change_functions (void)
   /* Record changes for all frames (if asked for), selected window and
      frame.  */
   unbind_to (count, Qnil);
+
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
 }
 
 /* Make WINDOW display BUFFER.  RUN_HOOKS_P means it's allowed
@@ -4054,6 +4075,9 @@ set_window_buffer (Lisp_Object window, Lisp_Object buffer,
   if (!samebuf && !MINI_WINDOW_P (w) && !WINDOW_PSEUDO_P (w))
     FRAME_WINDOW_CHANGE (XFRAME (w->frame)) = true;
 
+  if (WINDOWP (selected_window))
+    eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
+
   unbind_to (count, Qnil);
 }
 
@@ -5174,6 +5198,8 @@ DEFUN ("delete-window-internal", Fdelete_window_internal, Sdelete_window_interna
       error ("Deletion failed");
     }
 
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
+
   return Qnil;
 }
 \f
@@ -7233,6 +7259,9 @@ DEFUN ("set-window-configuration", Fset_window_configuration,
   minibuf_selected_window = data->minibuf_selected_window;
 
   SAFE_FREE ();
+
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
+
   return FRAME_LIVE_P (f) ? Qt : Qnil;
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index cc0a689ba3..ea64e5037a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12980,6 +12980,8 @@ restore_selected_window (Lisp_Object window)
       /* Abort if we cannot find a live frame.  */
       emacs_abort ();
     }
+
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
 }
 
 /* Restore WINDOW, if live, as its frame's selected window.  */
@@ -12997,6 +12999,8 @@ restore_frame_selected_window (Lisp_Object window)
       if (EQ (frame, selected_frame))
 	selected_window = window;
     }
+
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
 }
 
 /* Update the tab-bar item list for frame F.  This has to be done
@@ -13074,6 +13078,8 @@ update_tab_bar (struct frame *f, bool save_match_data)
 	  XSETFRAME (frame, f);
 	  selected_frame = frame;
 	  selected_window = FRAME_SELECTED_WINDOW (f);
+
+	  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
 #endif
 
 	  /* Build desired tab-bar items from keymaps.  */
@@ -14010,6 +14016,8 @@ update_tool_bar (struct frame *f, bool save_match_data)
 	  selected_frame = frame;
 	  selected_window = FRAME_SELECTED_WINDOW (f);
 
+	  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
+
 	  /* Build desired tool-bar items from keymaps.  */
           new_tool_bar
 	    = tool_bar_items (Fcopy_sequence (f->tool_bar_items),
@@ -17246,6 +17254,8 @@ run_window_scroll_functions (Lisp_Object window, struct text_pos startp)
       set_buffer_internal (XBUFFER (w->contents));
     }
 
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
+
   return startp;
 }
 
@@ -25450,6 +25460,8 @@ display_mode_lines (struct window *w)
 
   unbind_to (count, Qnil);
 
+  eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)));
+
   if (n > 0)
     w->must_be_updated_p = true;
   return n;

  reply	other threads:[~2021-03-31 15:49 UTC|newest]

Thread overview: 160+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-18 15:39 bug#47244: 28.0.50; SIGSEGV in long-runnning Emacs Michael Welsh Duggan
2021-03-18 15:42 ` Michael Welsh Duggan
2021-03-18 15:49   ` Michael Welsh Duggan
2021-03-18 16:02     ` Andreas Schwab
2021-03-18 16:02   ` Eli Zaretskii
2021-03-18 16:27     ` Michael Welsh Duggan
2021-03-18 16:45       ` Eli Zaretskii
2021-03-18 16:54         ` Michael Welsh Duggan
2021-03-18 18:41           ` Eli Zaretskii
2021-03-18 18:54             ` Michael Welsh Duggan
2021-03-18 19:16               ` Eli Zaretskii
2021-03-18 19:24                 ` Michael Welsh Duggan
2021-03-18 19:51                   ` Eli Zaretskii
2021-03-18 20:13                     ` Andreas Schwab
2021-03-18 20:27                       ` Eli Zaretskii
2021-03-19  1:50                         ` Michael Welsh Duggan
2021-03-19  6:47                           ` Eli Zaretskii
2021-03-19 13:37                             ` Michael Welsh Duggan
2021-03-19 13:41                               ` Michael Welsh Duggan
2021-03-19 13:51                                 ` Eli Zaretskii
2021-03-19 13:49                               ` Eli Zaretskii
2021-03-19 14:18                                 ` Michael Welsh Duggan
2021-03-19 14:21                                   ` Michael Welsh Duggan
2021-03-19 15:00                                     ` Eli Zaretskii
2021-03-19 15:14                                       ` Michael Welsh Duggan
2021-03-23 14:18                                       ` Michael Welsh Duggan
2021-03-23 15:02                                         ` Eli Zaretskii
2021-03-23 15:08                                           ` Michael Welsh Duggan
2021-03-23 16:42                                             ` Eli Zaretskii
2021-03-23 15:23                                         ` martin rudalics
2021-03-23 15:53                                           ` Michael Welsh Duggan
2021-03-23 16:45                                             ` Eli Zaretskii
2021-03-24  6:53                                             ` martin rudalics
2021-03-24 14:14                                               ` Michael Welsh Duggan
2021-03-24 16:09                                                 ` martin rudalics
2021-03-25  2:19                                                   ` Michael Welsh Duggan
2021-03-25  6:25                                                     ` Eli Zaretskii
2021-03-29 14:06                                                       ` Michael Welsh Duggan
2021-03-29 14:28                                                         ` Eli Zaretskii
2021-03-29 14:39                                                           ` Michael Welsh Duggan
2021-03-29 15:02                                                             ` Eli Zaretskii
2021-03-29 15:07                                                               ` Eli Zaretskii
2021-03-29 15:21                                                                 ` Michael Welsh Duggan
2021-03-29 15:26                                                                   ` Michael Welsh Duggan
2021-03-29 15:27                                                                   ` Eli Zaretskii
2021-03-29 15:33                                                                     ` Michael Welsh Duggan
2021-03-29 15:34                                                                       ` Michael Welsh Duggan
2021-03-29 15:41                                                                       ` Eli Zaretskii
2021-03-29 16:23                                                                         ` Michael Welsh Duggan
2021-03-29 15:21                                                                 ` Eli Zaretskii
2021-03-29 16:05                                                                   ` martin rudalics
2021-03-29 16:26                                                                     ` Michael Welsh Duggan
2021-03-29 17:33                                                                       ` martin rudalics
2021-03-29 19:12                                                                         ` Michael Welsh Duggan
2021-03-30  7:30                                                                           ` martin rudalics
2021-03-30 13:39                                                                             ` Michael Welsh Duggan
2021-03-30 14:36                                                                               ` martin rudalics
2021-03-30 14:51                                                                                 ` Michael Welsh Duggan
2021-03-30 15:05                                                                                   ` martin rudalics
2021-03-30 14:13                                                                             ` Michael Welsh Duggan
2021-03-30 14:36                                                                               ` martin rudalics
2021-03-30 14:48                                                                                 ` Eli Zaretskii
2021-03-30 15:05                                                                                   ` martin rudalics
2021-03-30 15:13                                                                                     ` Eli Zaretskii
2021-03-30 16:52                                                                                       ` martin rudalics
2021-03-30 17:05                                                                                         ` Eli Zaretskii
2021-03-31  6:41                                                                                           ` martin rudalics
2021-03-31  7:09                                                                                             ` Eli Zaretskii
2021-03-30 15:03                                                                                 ` Michael Welsh Duggan
2021-03-30 16:52                                                                                   ` martin rudalics
2021-03-31 13:23                                                                                 ` Michael Welsh Duggan
2021-03-31 13:53                                                                                   ` Michael Welsh Duggan
2021-03-31 14:01                                                                                     ` Eli Zaretskii
2021-03-31 14:32                                                                                       ` martin rudalics
2021-03-31 14:48                                                                                         ` Michael Welsh Duggan
2021-03-31 15:49                                                                                           ` martin rudalics [this message]
2021-03-31 17:01                                                                                             ` Michael Welsh Duggan
2021-03-31 18:41                                                                                               ` martin rudalics
2021-03-31 19:14                                                                                                 ` Michael Welsh Duggan
2021-03-31 19:18                                                                                                   ` Michael Welsh Duggan
2021-04-01  7:14                                                                                                     ` martin rudalics
2021-04-01  7:45                                                                                                       ` Eli Zaretskii
2021-04-01 13:20                                                                                                         ` Michael Welsh Duggan
2021-04-01 13:22                                                                                                           ` Eli Zaretskii
2021-04-01 13:54                                                                                             ` Michael Welsh Duggan
2021-04-01 14:56                                                                                               ` martin rudalics
2021-04-01 18:30                                                                                                 ` Michael Welsh Duggan
2021-04-01 19:31                                                                                                   ` Michael Welsh Duggan
2021-04-02  6:48                                                                                                   ` martin rudalics
2021-04-05 18:15                                                                                                     ` Michael Welsh Duggan
2021-04-05 18:45                                                                                                       ` martin rudalics
2021-04-05 19:57                                                                                                         ` Michael Welsh Duggan
2021-04-05 20:39                                                                                                           ` martin rudalics
2021-04-05 20:56                                                                                                             ` Michael Welsh Duggan
2021-04-06  8:10                                                                                                               ` martin rudalics
2021-04-06 14:40                                                                                                                 ` Michael Welsh Duggan
2021-04-06 16:12                                                                                                                   ` martin rudalics
2021-04-06 16:48                                                                                                                     ` Michael Welsh Duggan
2021-04-06 17:00                                                                                                                       ` martin rudalics
2021-04-06 17:24                                                                                                                         ` Michael Welsh Duggan
2021-04-07  2:22                                                                                                                           ` Michael Welsh Duggan
2021-04-07  7:52                                                                                                                             ` Andreas Schwab
2021-04-07  9:00                                                                                                                             ` martin rudalics
2021-04-07 12:42                                                                                                                               ` Michael Welsh Duggan
2021-04-07 13:35                                                                                                                                 ` martin rudalics
2021-04-07 15:29                                                                                                                                   ` Michael Welsh Duggan
2021-04-07 16:16                                                                                                                                     ` martin rudalics
2021-04-07 17:37                                                                                                                                       ` Michael Welsh Duggan
2021-04-07 17:55                                                                                                                                         ` Michael Welsh Duggan
2021-04-07 18:31                                                                                                                                         ` Michael Welsh Duggan
2021-04-07 19:25                                                                                                                                           ` Michael Welsh Duggan
2021-04-07 20:25                                                                                                                                             ` martin rudalics
2021-04-07 20:32                                                                                                                                               ` Michael Welsh Duggan
2021-04-08  6:59                                                                                                                                                 ` martin rudalics
2021-04-08 10:47                                                                                                                                                   ` Gregory Heytings
2021-04-08 11:39                                                                                                                                                     ` Eli Zaretskii
2021-04-08 12:06                                                                                                                                                       ` Andreas Schwab
2021-04-08 12:29                                                                                                                                                         ` Eli Zaretskii
2021-04-08 12:43                                                                                                                                                           ` Gregory Heytings
2021-04-08 12:59                                                                                                                                                             ` Eli Zaretskii
2021-04-08 16:20                                                                                                                                                               ` Gregory Heytings
2021-04-08 12:03                                                                                                                                                     ` martin rudalics
2021-04-08 12:24                                                                                                                                                       ` Gregory Heytings
2021-04-08 13:39                                                                                                                                                         ` Michael Welsh Duggan
2021-04-08 14:35                                                                                                                                                   ` Michael Welsh Duggan
2021-04-08 15:08                                                                                                                                                     ` Eli Zaretskii
2021-04-08 15:24                                                                                                                                                       ` Andreas Schwab
2021-04-08 15:21                                                                                                                                                     ` Michael Welsh Duggan
2021-04-08 15:33                                                                                                                                                       ` Michael Welsh Duggan
2021-04-08 15:48                                                                                                                                                       ` martin rudalics
2021-04-08 16:01                                                                                                                                                         ` Michael Welsh Duggan
2021-04-08 16:14                                                                                                                                                           ` martin rudalics
2021-04-08 16:35                                                                                                                                                           ` Eli Zaretskii
2021-04-08 16:42                                                                                                                                                             ` Michael Welsh Duggan
2021-04-08 15:58                                                                                                                                                       ` Eli Zaretskii
2021-04-08 16:05                                                                                                                                                         ` Michael Welsh Duggan
2021-04-08 16:28                                                                                                                                                           ` Eli Zaretskii
2021-04-08 16:37                                                                                                                                                             ` Michael Welsh Duggan
2021-04-08 16:49                                                                                                                                                               ` Eli Zaretskii
2021-04-08 17:15                                                                                                                                                                 ` Michael Welsh Duggan
2021-04-08 17:11                                                                                                                                                         ` Michael Welsh Duggan
2021-04-08 17:46                                                                                                                                                           ` Eli Zaretskii
2021-04-08 17:51                                                                                                                                                             ` Michael Welsh Duggan
2021-04-08 18:52                                                                                                                                                           ` martin rudalics
2021-04-09 20:59                                                                                                                                                             ` Michael Welsh Duggan
2021-04-10  7:15                                                                                                                                                               ` martin rudalics
2021-04-10 14:53                                                                                                                                                                 ` Michael Welsh Duggan
2021-04-10 18:57                                                                                                                                                                   ` martin rudalics
2021-04-17  8:01                                                                                                                                                                     ` martin rudalics
2021-04-20 14:03                                                                                                                                                                       ` Michael Welsh Duggan
2021-04-07 19:40                                                                                                                                           ` Eli Zaretskii
2021-04-07 18:48                                                                                                                                         ` martin rudalics
2021-04-07 18:53                                                                                                                                           ` Michael Welsh Duggan
2021-04-07 20:25                                                                                                                                             ` martin rudalics
2021-04-07  9:00                                                                                                                           ` martin rudalics
2021-03-19  8:15                         ` martin rudalics
2021-03-19  8:19                           ` Eli Zaretskii
2021-03-19  9:18                             ` martin rudalics
2021-03-19  9:37                               ` martin rudalics
2021-03-19 11:55                               ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dfd90ddc-2c42-f5e3-8681-ec72cc87fa52@gmx.at \
    --to=rudalics@gmx.at \
    --cc=47244@debbugs.gnu.org \
    --cc=mwd@cert.org \
    --cc=mwd@md5i.com \
    --cc=schwab@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).