]> git.eshelyaron.com Git - emacs.git/commit
Avoid crashes upon C-g in nested invocations of 'read_char'
authorEli Zaretskii <eliz@gnu.org>
Wed, 13 Feb 2019 15:39:31 +0000 (17:39 +0200)
committerEli Zaretskii <eliz@gnu.org>
Wed, 13 Feb 2019 15:43:55 +0000 (17:43 +0200)
commit6d89120b156576ca24e03472563f5ea0f01313f8
tree89cef46e498e3a510eac9a9324c3f69d9951fbdf
parent3f4b8e9a299f88a8ea11c0ea6a281a34852e541a
Avoid crashes upon C-g in nested invocations of 'read_char'

* src/keyboard.c (read_char, read_event_from_main_queue):
Ensure the global value of getcjmp is restored when the stack
is unwound by the likes of 'throw', by calling
record_unwind_protect_ptr instead of restoring the value
manually.  (Bug#34394)
(restore_getcjmp): Argument is now 'void *', to match the
signature of record_unwind_protect_ptr.

(cherry picked from commit 10527fca66e39d7067986904161fa33741abcd26)
src/keyboard.c