diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-09-01 18:43:43 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-09-01 18:43:43 +0300 |
| commit | bed10876dba330b24419a6144dc62db52bb273ab (patch) | |
| tree | a5480db866493e1fa7db43bdc2c8b4bbde0ac4a6 /src/lisp.h | |
| parent | e57df8f77901a3964d21c3d57fb6769cf4511dc2 (diff) | |
| download | emacs-bed10876dba330b24419a6144dc62db52bb273ab.tar.gz emacs-bed10876dba330b24419a6144dc62db52bb273ab.tar.bz2 emacs-bed10876dba330b24419a6144dc62db52bb273ab.zip | |
Fix crashes when unbind_for_thread_switch signals an error.
src/eval.c (unbind_for_thread_switch): Accept a 'struct
thread_state *' argument and use specpdl_ptr and specpdl of that
thread. Fixes crashes if find_symbol_value signals an error.
src/thread.c (post_acquire_global_lock): Update current_thread
before calling unbind_for_thread_switch. Pass the previous thread
to unbind_for_thread_switch.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h index 51c09e0abb3..03628e13ac2 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3828,7 +3828,7 @@ extern void set_unwind_protect (ptrdiff_t, void (*) (Lisp_Object), Lisp_Object); extern void set_unwind_protect_ptr (ptrdiff_t, void (*) (void *), void *); extern Lisp_Object unbind_to (ptrdiff_t, Lisp_Object); extern void rebind_for_thread_switch (void); -extern void unbind_for_thread_switch (void); +extern void unbind_for_thread_switch (struct thread_state *); extern _Noreturn void error (const char *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2); extern _Noreturn void verror (const char *, va_list) ATTRIBUTE_FORMAT_PRINTF (1, 0); |