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 18:10:06 +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> 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="100451"; 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 19:19:19 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 1gtceM-000Pxp-U7 for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Feb 2019 19:19:19 +0100 Original-Received: from localhost ([127.0.0.1]:43792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtceG-0004q1-Em for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Feb 2019 13:19:12 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:34510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtcbI-0002JP-R7 for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2019 13:16:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtcWP-0002jM-NI for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2019 13:11:07 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:45894) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtcWM-0002fz-L0 for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2019 13:11:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gtcWM-0004EU-5l for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2019 13:11:02 -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 18:11:02 +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.154999502616225 (code B ref 34394); Tue, 12 Feb 2019 18:11:02 +0000 Original-Received: (at 34394) by debbugs.gnu.org; 12 Feb 2019 18:10:26 +0000 Original-Received: from localhost ([127.0.0.1]:45175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtcVl-0004Dc-R8 for submit@debbugs.gnu.org; Tue, 12 Feb 2019 13:10:26 -0500 Original-Received: from mail-qt1-f181.google.com ([209.85.160.181]:36312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtcVk-0004DQ-GL for 34394@debbugs.gnu.org; Tue, 12 Feb 2019 13:10:25 -0500 Original-Received: by mail-qt1-f181.google.com with SMTP id r9so4065167qtt.3 for <34394@debbugs.gnu.org>; Tue, 12 Feb 2019 10:10:24 -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=jycLhDghWeWRiZ9xK8XRLzUi3rYm4dUnkcsZdj8XvC8=; b=Tgjzw6rKsZCOvJp1EWLNwNCcEO0vNgQ2kptlL4QDAUE4CrCi4wEU7wqPzzOYEhg0+Z cYz/Kbxpy33Nxt788kuI++jpvdMm7q6kK/dMRv2LcrYcMbW5FbRzthZxDPS1BIaJ5INw fEMY2aenCBf8acR7yMAu1HBpcBDRu3a+LyukTKPJLMGK41ybGdOjVBswDMtete3v/2Mj AeOf9FTdKlrVw/zsX2WA7QpKtMjB/kKrkxbfS0xdPdD75SH96Wn1uzr5bQ8RoWtVdpyE PH4bzHoaNoAS9hhbzqUxopLLCtplUGYnxbvHKmoGb/F/WUNfaxExU3JauNCEtxrlUzlb 1zwQ== 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=jycLhDghWeWRiZ9xK8XRLzUi3rYm4dUnkcsZdj8XvC8=; b=ptImHarl9D5EF75bwhIVPjEBGjeRIy9C5M8dRLZc1EzNRklR6mMSQR7OwF5z3vu9XQ 80A5bmEayplipS26O0zhBtCVKpj2502hceliX+4a0mLjBdZvdi5sNA3Jj8w4nglkrDTz z4dmSBS4rnBQFUWEk6/UaOx/Qz3F2HmFbhM+k1CqPX8QJIGkPbde1e9UngFXrhgYYcF5 bCyW2ENXdX952qCy6zN9iyaV4cifXwcBnUbBux+qs8fXYA3IL8rK7WqO/jeXmXJ58xZ6 rOhlM8VXKzj5sWWTgn7I/H78sWwKFgTgtSd9Ax/YndrxbqaP03yAZkxSQj5nXNKoGf25 kJsg== X-Gm-Message-State: AHQUAuaGFaeoTLnTEBpHF2Uj71FHjJIntoZ4F/ETgzLKGBlwc4KLzr1A SEkI0jxWHsVhk68hB0M1smppe+lWicFSHVMtIaTfUg== X-Google-Smtp-Source: AHgI3IYnMwwgd3x8Ef8zSYe4LeqZdl+QfGhR7mK9wFsuTTCvU5bSoIE4H4NkYWYklgqYK3iwNoJYh26RPQE94enkMQA= X-Received: by 2002:aed:2a6d:: with SMTP id k42mr4056277qtf.390.1549995018894; Tue, 12 Feb 2019 10:10:18 -0800 (PST) In-Reply-To: <83h8d8q5q7.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:155378 Archived-At: Thanks! Will do. If it works, can this please make it to Emacs 26.2? Jo=C3=A3o On Tue, Feb 12, 2019 at 5:25 PM Eli Zaretskii wrote: > > > Date: Sun, 10 Feb 2019 18:42:40 +0200 > > From: Eli Zaretskii > > Cc: 34394@debbugs.gnu.org > > > > > src/emacs -Q -L path/to/company-mode -l company -l foo.el -f foo-te= st-bug > > > > Thanks, this reproduces the problem with 100% probability, and I'm > > looking into the problem. > > I think I found the culprit. Please see if the patch below fixes the > problem, including the one you had in the real-life scenario and > environment. > > diff --git a/src/keyboard.c b/src/keyboard.c > index 49c687f..f6550f7 100644 > --- a/src/keyboard.c > +++ b/src/keyboard.c > @@ -365,6 +365,7 @@ static Lisp_Object make_lispy_focus_out (Lisp_Object)= ; > static bool help_char_p (Lisp_Object); > static void save_getcjmp (sys_jmp_buf); > static void restore_getcjmp (sys_jmp_buf); > +static void unwind_getcjmp (void *); > static Lisp_Object apply_modifiers (int, Lisp_Object); > static void restore_kboard_configuration (int); > static void handle_interrupt (bool); > @@ -2144,12 +2145,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 (unwind_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 +2641,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 (unwind_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 +2717,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 (unwind_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)) > @@ -3329,6 +3336,14 @@ restore_getcjmp (sys_jmp_buf temp) > { > memcpy (getcjmp, temp, sizeof getcjmp); > } > + > +static void > +unwind_getcjmp (void *ptr) > +{ > + sys_jmp_buf jbuf; > + memcpy (jbuf, *(sys_jmp_buf *)ptr, sizeof getcjmp); > + restore_getcjmp (jbuf); > +} > > /* Low level keyboard/mouse input. > kbd_buffer_store_event places events in kbd_buffer, and --=20 Jo=C3=A3o T=C3=A1vora