From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.bugs Subject: bug#47244: 28.0.50; SIGSEGV in long-runnning Emacs Date: Wed, 31 Mar 2021 17:49:40 +0200 Message-ID: References: <87im5ofp3z.fsf@md5i.com> <87a6qs7z60.fsf@md5i.com> <83eeg3kawg.fsf@gnu.org> <83y2e6kp9t.fsf@gnu.org> <83tuouknpb.fsf@gnu.org> <83sg4eknh5.fsf@gnu.org> <83r1jykmt0.fsf@gnu.org> <2d0dbdc8-3678-cd21-234a-9c63bb004629@gmx.at> <834kgrifrt.fsf@gnu.org> <106ce987-1a45-bbdf-3897-445baa99a476@gmx.at> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------EC1F43715A974F433B5C6E48" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39651"; mail-complaints-to="usenet@ciao.gmane.io" Cc: "mwd@md5i.com" , "schwab@linux-m68k.org" , "47244@debbugs.gnu.org" <47244@debbugs.gnu.org> To: Michael Welsh Duggan Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Mar 31 18:02:58 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lRdJ3-000A9u-K4 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 31 Mar 2021 18:02:57 +0200 Original-Received: from localhost ([::1]:43922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRdJ2-0000fL-C3 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 31 Mar 2021 12:02:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRd6Z-00052k-2H for bug-gnu-emacs@gnu.org; Wed, 31 Mar 2021 11:50:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:43719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRd6Y-0004XJ-Nk for bug-gnu-emacs@gnu.org; Wed, 31 Mar 2021 11:50:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRd6Y-0000Xi-IT for bug-gnu-emacs@gnu.org; Wed, 31 Mar 2021 11:50:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 31 Mar 2021 15:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47244 X-GNU-PR-Package: emacs Original-Received: via spool by 47244-submit@debbugs.gnu.org id=B47244.16172057972070 (code B ref 47244); Wed, 31 Mar 2021 15:50:02 +0000 Original-Received: (at 47244) by debbugs.gnu.org; 31 Mar 2021 15:49:57 +0000 Original-Received: from localhost ([127.0.0.1]:55265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRd6T-0000XK-1G for submit@debbugs.gnu.org; Wed, 31 Mar 2021 11:49:57 -0400 Original-Received: from mout.gmx.net ([212.227.17.22]:47395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRd6R-0000X6-7N for 47244@debbugs.gnu.org; Wed, 31 Mar 2021 11:49:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1617205782; bh=YE9rFjfwbD5nnzuHNzETYg1ISzhM07DYjdVsQzbCIj0=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=QsXPDjtxYsV1RoWUmHuNrCAMOlL5X4xrJhGZ8v7qANg4ANO6W2vjEi4C5Jgw/RFn+ wjlH0EI7EWDMTTdNx2vZhJA+l3Z4FB5/IGHh8GzWw1+QWLD1OthhmqpOXRUYC1gvuY km16x035wc1K3WWLouo2Crxmz8lUasa8EtfsXj48= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.100] ([212.95.5.108]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MIMfc-1lM9SM0SaC-00EP4j; Wed, 31 Mar 2021 17:49:42 +0200 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:x2iN09rmuqKHsYWKGBcpBJEpDgDXDPC0G8cMo/Tv54Xlx0cIRA8 JxhM1xO3sSk5ltm9GQDHiah3RqgmJCvt8dQejDJk6NWoiRGl9fW5cAeBWB0PUWOaZgY2Ejs slQPOc1e3N1D6WcC0T610g1WP8i11ASrRDhrerEPycSjWRrdmflluqwHLZYq6xtYLI+ph/f Gzp6MPp4RzRg0633o79LQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:DTEz+Owl3i4=:dL/0H02zar0zHMsALDV+uJ vQEz5wrieGxakxgaxzpUyGsqUISKkraW3Kl1w9gRNLkVVEH5CW849Z3zMuWmJV3y5wWxxsYFT IM5T8jBjyXsn02V0Eew6EoYsuEzjGIJqgu0f2B7j6TiA1xV/YzUsr6+AuLGvQ4ZkNGEU78BQ/ nqLfByr/PP5ZLwxUCSTyur6Ntd4seeNamn45BdDzk8dk8SGkh5i4WY1LaiPsJ6ZO0CtMBNVr8 64f5/CX+mAP60X0OuZpIVh9Owr2n59KJ2mCx5mVZuJOrM9ZYlymW8zXfwPYGu16kb2J66Kctf B2KahvNTNu5uQWjyoV83QLzmnUpjCpqXXBdXK8JGREebfwwzjod+U3r7TeaBmj152oT8/fydQ NuzjXNw1FWhNVYop2zdpZMS4g47FXckaSHV/CTTYKinnNZ3vzx915+Ut0BiNcEC2IDCiTnPiG Oobtw4iCTnsMKJ4vDonjOIHH0euTzX1O1saj0Af0HhsQuMmKPLaLSaScfT5Vo9V6hlPawFs9l naUf4h4E3Mg280mrzVMc1TIfXDUOMBOqHQkqpGBEbSOkLFwfUQW+2YJOYqaVlQyOliqDx+kYj mnNjMvHvBE47RUWsus9fzEu/HpeOm1iSIjsXIAEBm11WWvXkQrCg665hFW/jMbfY+wTRUvyjQ xq7TKpsnTEZCGuafgBHeRk0hvZ1hICbt6GRdPgFaaUJ1wBZtVyRKTa7jIIBJFQbI7JLUxs4bB xvqIAXYOnsVhi1RmKBElXk/6EME8WagB3o6narlrUf2/DO7+R4B1qGu/SNOlEPvKtl3tcToI X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:203372 Archived-At: This is a multi-part message in MIME format. --------------EC1F43715A974F433B5C6E48 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit > 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 --------------EC1F43715A974F433B5C6E48 Content-Type: text/x-patch; name="selected_window_contents.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="selected_window_contents.diff" 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); =20 + if (!b->base_buffer) + eassert (b->window_count =3D=3D 0); + bset_name (b, Qnil); =20 block_input (); @@ -1991,6 +1994,8 @@ DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0= , 1, "bKill buffer: ", =20 run_buffer_list_update_hook (b); =20 + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents))= ); + return Qt; } =0C @@ -2151,6 +2156,9 @@ set_buffer_internal_1 (register struct buffer *b) =20 BUFFER_CHECK_INDIRECTION (b); =20 + if (!BUFFER_LIVE_P (b)) + error ("Selecting deleted buffer"); + old_buf =3D current_buffer; current_buffer =3D b; last_known_column_point =3D -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 =3D 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 =3D val; } =20 @@ -594,6 +599,8 @@ select_window_1 (Lisp_Object window, bool inhibit_poi= nt_swap) =20 selected_window =3D window; =20 + 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_lis= t_1, 0, 3, 0, CHECK_ALL_WINDOWS /* Arg is ignored */ }; =20 +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) =3D=3D current_buffer) Fset_buffer (w->contents); + + replace_buffer_in_windows_safely_count +=3D 1; } break; =20 @@ -3411,6 +3422,8 @@ DEFUN ("delete-other-windows-internal", Fdelete_oth= er_windows_internal, replace_buffer_in_windows (Lisp_Object buffer) { call1 (Qreplace_buffer_in_windows, buffer); + + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents))= ); } =20 /* 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 =3D buffer_window_count (XBUFFER (buffer)); + + replace_buffer_in_windows_safely_count =3D 0; + if (buffer_window_count (XBUFFER (buffer))) { Lisp_Object tail, frame; @@ -3429,6 +3446,8 @@ replace_buffer_in_windows_safely (Lisp_Object buffe= r) FOR_EACH_FRAME (tail, frame) window_loop (REPLACE_BUFFER_IN_WINDOWS_SAFELY, buffer, true, frame); } + + eassert (count =3D=3D replace_buffer_in_windows_safely_count); } =0C /* 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))= ); } =20 /* 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)) =3D true; =20 + if (WINDOWP (selected_window)) + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents= ))); + unbind_to (count, Qnil); } =20 @@ -5174,6 +5198,8 @@ DEFUN ("delete-window-internal", Fdelete_window_int= ernal, Sdelete_window_interna error ("Deletion failed"); } =20 + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents))= ); + return Qnil; } =0C @@ -7233,6 +7259,9 @@ DEFUN ("set-window-configuration", Fset_window_conf= iguration, minibuf_selected_window =3D data->minibuf_selected_window; =20 SAFE_FREE (); + + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents))= ); + return FRAME_LIVE_P (f) ? Qt : Qnil; } =20 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))= ); } =20 /* 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 =3D window; } + + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents))= ); } =20 /* 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 =3D frame; selected_window =3D FRAME_SELECTED_WINDOW (f); + + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)= )); #endif =20 /* Build desired tab-bar items from keymaps. */ @@ -14010,6 +14016,8 @@ update_tool_bar (struct frame *f, bool save_match= _data) selected_frame =3D frame; selected_window =3D FRAME_SELECTED_WINDOW (f); =20 + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents)= )); + /* Build desired tool-bar items from keymaps. */ new_tool_bar =3D 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)); } =20 + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents))= ); + return startp; } =20 @@ -25450,6 +25460,8 @@ display_mode_lines (struct window *w) =20 unbind_to (count, Qnil); =20 + eassert (BUFFER_LIVE_P (XBUFFER (XWINDOW (selected_window)->contents))= ); + if (n > 0) w->must_be_updated_p =3D true; return n; --------------EC1F43715A974F433B5C6E48--