From: Eli Zaretskii <eliz@gnu.org>
To: joaotavora@gmail.com
Cc: 34394@debbugs.gnu.org
Subject: bug#34394: 27.0.50; Emacs segfaults with SLY, company and C-g
Date: Tue, 12 Feb 2019 19:25:20 +0200 [thread overview]
Message-ID: <83h8d8q5q7.fsf@gnu.org> (raw)
In-Reply-To: <838synmw73.fsf@gnu.org> (message from Eli Zaretskii on Sun, 10 Feb 2019 18:42:40 +0200)
> Date: Sun, 10 Feb 2019 18:42:40 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 34394@debbugs.gnu.org
>
> > src/emacs -Q -L path/to/company-mode -l company -l foo.el -f foo-test-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 = 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 = kbd_buffer_get_event (&kb, used_mouse_menu, end_time);
- restore_getcjmp (save_jump);
+ unbind_to (count, Qnil);
if (! NILP (c) && (kb != current_kboard))
{
@@ -2638,10 +2641,12 @@ read_char (int commandflag, Lisp_Object map,
{
Lisp_Object tem0;
+ ptrdiff_t count = SPECPDL_INDEX ();
save_getcjmp (save_jump);
+ record_unwind_protect_ptr (unwind_getcjmp, &save_jump);
restore_getcjmp (local_getcjmp);
tem0 = 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 = min (timeout, MOST_POSITIVE_FIXNUM / delay_level * 4);
timeout = delay_level * timeout / 4;
+ ptrdiff_t count1 = SPECPDL_INDEX ();
save_getcjmp (save_jump);
+ record_unwind_protect_ptr (unwind_getcjmp, &save_jump);
restore_getcjmp (local_getcjmp);
tem0 = 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);
+}
\f
/* Low level keyboard/mouse input.
kbd_buffer_store_event places events in kbd_buffer, and
next prev parent reply other threads:[~2019-02-12 17:25 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-09 0:55 bug#34394: 27.0.50; Emacs segfaults with SLY, company and C-g João Távora
2019-02-09 7:59 ` Eli Zaretskii
2019-02-09 9:45 ` João Távora
2019-02-09 10:10 ` Eli Zaretskii
2019-02-09 11:31 ` João Távora
2019-02-09 12:11 ` Eli Zaretskii
2019-02-09 12:33 ` Eli Zaretskii
2019-02-09 12:56 ` João Távora
2019-02-09 13:11 ` Eli Zaretskii
2019-02-09 13:23 ` João Távora
2019-02-09 13:46 ` Eli Zaretskii
2019-02-09 14:00 ` João Távora
2019-02-09 14:01 ` João Távora
2019-02-09 14:13 ` João Távora
2019-02-09 14:36 ` Eli Zaretskii
2019-02-09 15:21 ` Eli Zaretskii
2019-02-09 15:37 ` João Távora
2019-02-09 15:51 ` Eli Zaretskii
2019-02-09 16:04 ` João Távora
2019-02-09 16:14 ` João Távora
2019-02-09 16:20 ` Eli Zaretskii
2019-02-09 16:26 ` João Távora
2019-02-09 20:08 ` João Távora
2019-02-10 16:42 ` Eli Zaretskii
2019-02-12 17:25 ` Eli Zaretskii [this message]
2019-02-12 18:10 ` João Távora
2019-02-12 18:29 ` Eli Zaretskii
2019-02-12 19:15 ` Eli Zaretskii
2019-02-12 20:42 ` João Távora
2019-02-13 16:26 ` Eli Zaretskii
2019-02-18 20:42 ` João Távora
2019-02-19 3:28 ` Eli Zaretskii
2019-02-09 16:21 ` Eli Zaretskii
2019-02-09 14:48 ` Eli Zaretskii
2019-02-09 11:38 ` João Távora
2019-02-09 8:08 ` Andreas Schwab
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=83h8d8q5q7.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=34394@debbugs.gnu.org \
--cc=joaotavora@gmail.com \
/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).