From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Newsgroups: gmane.emacs.bugs Subject: bug#34394: 27.0.50; Emacs segfaults with SLY, company and C-g Date: Tue, 12 Feb 2019 20:42:04 +0000 Message-ID: References: <87va1tye42.fsf@gmail.com> <83wom9o0hu.fsf@gnu.org> <87r2chxpli.fsf@gmail.com> <83k1i9nugh.fsf@gnu.org> <87mun5xko7.fsf@gmail.com> <83h8ddnouf.fsf@gnu.org> <83ftsxnnug.fsf@gnu.org> <87bm3lxgr4.fsf@gmail.com> <83ef8hnm38.fsf@gnu.org> <877ee9xfid.fsf@gmail.com> <83bm3lnkfh.fsf@gnu.org> <8736oxxdsg.fsf@gmail.com> <87va1tvz54.fsf@gmail.com> <87r2chvylb.fsf@gmail.com> <831s4hng19.fsf@gnu.org> <83wom9m02z.fsf@gnu.org> <87bm3lgd8q.fsf@gmail.com> <83va1tlyqy.fsf@gnu.org> <875zts208z.fsf@gmail.com> <838synmw73.fsf@gnu.org> <83h8d8q5q7.fsf@gnu.org> <83d0nwq2rg.fsf@gnu.org> <83bm3gq0mv.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="260667"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 34394@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 12 21:57:33 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gtf7T-0015iH-Vz for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Feb 2019 21:57:32 +0100 Original-Received: from localhost ([127.0.0.1]:45982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtf7S-0007Xz-Vr for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Feb 2019 15:57:31 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:55549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtf50-0005Y9-AB for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2019 15:54:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtetR-0005eb-Ri for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2019 15:43:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:45993) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtetR-0005eU-NQ for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2019 15:43:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gtetR-00088m-K5 for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2019 15:43:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 12 Feb 2019 20:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34394 X-GNU-PR-Package: emacs Original-Received: via spool by 34394-submit@debbugs.gnu.org id=B34394.155000414431240 (code B ref 34394); Tue, 12 Feb 2019 20:43:01 +0000 Original-Received: (at 34394) by debbugs.gnu.org; 12 Feb 2019 20:42:24 +0000 Original-Received: from localhost ([127.0.0.1]:45274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtesq-00087n-4E for submit@debbugs.gnu.org; Tue, 12 Feb 2019 15:42:24 -0500 Original-Received: from mail-qk1-f180.google.com ([209.85.222.180]:33320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtesn-00087T-Sw for 34394@debbugs.gnu.org; Tue, 12 Feb 2019 15:42:22 -0500 Original-Received: by mail-qk1-f180.google.com with SMTP id x9so54846qkf.0 for <34394@debbugs.gnu.org>; Tue, 12 Feb 2019 12:42:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=9SEgYVPXCbPmpOm/n+oFdmOJS8Pb4n/J2+pn3uxPOv8=; b=b5aKnmNWV7YESluyKr70fyHW2ZLyMa3kLNCysKQxJJshVpaLxJwaL/R0yILqhnWt2+ zegWveAqRl/fBMtMN2zzAb1yrBN4nqU3pLJ+5mqx2nzLUqi3BlJddw5KnYHyx0h1La9C 0v/uq7XCNUqcOjCjP3dAE/01kdX8bfIHKzcsotL86Ik8NzyHdm8Ur51ahnCQm+DUES4e NPz6Qj/Zl6ZzMoZ+37mDYsc5hAG7d8n3z/NYh5TuGMZt6cbH8p7qS/tkRbNCC2aqayiE dUdSGVcujAemg4CCG2K+OQQ3FGYjB0ZXftCMrCrYDET7BRv8RmI//SBzcd2L0MK0lclE nmgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=9SEgYVPXCbPmpOm/n+oFdmOJS8Pb4n/J2+pn3uxPOv8=; b=rkH3D7Lye4jtuq/w0yHt4lMGJlkewNqPk6r0dPrp/ydhuh3xwsW03u5YcN4ZHJbxo1 OAK2AuEvhEwOKUZiSo5BZ4j0vYKJ5x8Gxf73pL7KN0HgwqZMvBW1ZR88jpzL6S/PcGqq cDhUEdVwHzzNF3CEbdTDTDxQebwwyvYX1ELMRpyPKOJnoc7VY+z4iGVLoChAWl37cXWH 0JZLUXND3kkcDKWWUD5TOR7YpJzyVD4nU5J1C++V3XEpOxuee58oMT3EvR0BRFwo7kLP eD1XY3TTC1xc1fgwhu5kCeBEDzTPmJ1EqZeipokAzd+621SbK9vMelJc7Uq0QR7mlq7h qWJQ== X-Gm-Message-State: AHQUAua9NZDyq0Xfuy7HY2c0pjKg0bjlTqjoICP2N3o2iNGlIG8lletu KBijuFVE41I4jTZILwSx79JalfQrxF7hXlHJpGCmFw== X-Google-Smtp-Source: AHgI3IaZy73utXdCpgPTkAtR5up8q7NdNebi8dvh3+DvTisOQPnNIgIRe9UCV3cKIhBLH4KETwivow3+jpXNjGXuTYw= X-Received: by 2002:ae9:dc45:: with SMTP id q66mr4110194qkf.147.1550004136236; Tue, 12 Feb 2019 12:42:16 -0800 (PST) In-Reply-To: <83bm3gq0mv.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:155385 Archived-At: I applied to the emacs-26 branch where it seems to have fixed it, meaning I couldn't reproduce it anymore after some attempts. I would find it prudent to merge into master: since I run a master build these days at work, where I use SLY very much, it would equal much better testing. So I'd push to both branches (and maybe mark the 26 version "don't merge"). Anyway, a big thanks! Jo=C3=A3o PS: if you have the time, a short explanation of the problem would be welcome/pedagogical On Tue, Feb 12, 2019 at 7:15 PM Eli Zaretskii wrote: > > > Date: Tue, 12 Feb 2019 20:29:23 +0200 > > From: Eli Zaretskii > > Cc: 34394@debbugs.gnu.org > > > > > From: Jo=C3=A3o T=C3=A1vora > > > Date: Tue, 12 Feb 2019 18:10:06 +0000 > > > Cc: 34394@debbugs.gnu.org > > > > > > If it works, can this please make it to Emacs 26.2? > > > > I hope so. > > Actually, please try this simpler patch instead: > > diff --git a/src/keyboard.c b/src/keyboard.c > index 49c687f..282eac7 100644 > --- a/src/keyboard.c > +++ b/src/keyboard.c > @@ -364,7 +364,7 @@ static Lisp_Object make_lispy_focus_out (Lisp_Object)= ; > #endif /* HAVE_WINDOW_SYSTEM */ > static bool help_char_p (Lisp_Object); > static void save_getcjmp (sys_jmp_buf); > -static void restore_getcjmp (sys_jmp_buf); > +static void restore_getcjmp (void *); > static Lisp_Object apply_modifiers (int, Lisp_Object); > static void restore_kboard_configuration (int); > static void handle_interrupt (bool); > @@ -2144,12 +2144,14 @@ read_event_from_main_queue (struct timespec *end_= time, > return c; > > /* Actually read a character, waiting if necessary. */ > + ptrdiff_t count =3D SPECPDL_INDEX (); > save_getcjmp (save_jump); > + record_unwind_protect_ptr (restore_getcjmp, save_jump); > restore_getcjmp (local_getcjmp); > if (!end_time) > timer_start_idle (); > c =3D kbd_buffer_get_event (&kb, used_mouse_menu, end_time); > - restore_getcjmp (save_jump); > + unbind_to (count, Qnil); > > if (! NILP (c) && (kb !=3D current_kboard)) > { > @@ -2638,10 +2640,12 @@ read_char (int commandflag, Lisp_Object map, > { > Lisp_Object tem0; > > + ptrdiff_t count =3D SPECPDL_INDEX (); > save_getcjmp (save_jump); > + record_unwind_protect_ptr (restore_getcjmp, save_jump); > restore_getcjmp (local_getcjmp); > tem0 =3D sit_for (Vecho_keystrokes, 1, 1); > - restore_getcjmp (save_jump); > + unbind_to (count, Qnil); > if (EQ (tem0, Qt) > && ! CONSP (Vunread_command_events)) > echo_now (); > @@ -2712,10 +2716,12 @@ read_char (int commandflag, Lisp_Object map, > > timeout =3D min (timeout, MOST_POSITIVE_FIXNUM / delay_level * = 4); > timeout =3D delay_level * timeout / 4; > + ptrdiff_t count1 =3D SPECPDL_INDEX (); > save_getcjmp (save_jump); > + record_unwind_protect_ptr (restore_getcjmp, save_jump); > restore_getcjmp (local_getcjmp); > tem0 =3D sit_for (make_number (timeout), 1, 1); > - restore_getcjmp (save_jump); > + unbind_to (count1, Qnil); > > if (EQ (tem0, Qt) > && ! CONSP (Vunread_command_events)) > @@ -3325,7 +3331,7 @@ save_getcjmp (sys_jmp_buf temp) > } > > static void > -restore_getcjmp (sys_jmp_buf temp) > +restore_getcjmp (void *temp) > { > memcpy (getcjmp, temp, sizeof getcjmp); > } --=20 Jo=C3=A3o T=C3=A1vora