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/eval.c | |
| parent | e57df8f77901a3964d21c3d57fb6769cf4511dc2 (diff) | |
| download | emacs-bed10876dba330b24419a6144dc62db52bb273ab.tar.gz | |
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/eval.c')
| -rw-r--r-- | src/eval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 68a3691ad9b..b8a61590387 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3484,11 +3484,11 @@ unbind_to (ptrdiff_t count, Lisp_Object value) } void -unbind_for_thread_switch (void) +unbind_for_thread_switch (struct thread_state *thr) { union specbinding *bind; - for (bind = specpdl_ptr; bind != specpdl; --bind) + for (bind = thr->m_specpdl_ptr; bind != thr->m_specpdl; --bind) { if (bind->kind >= SPECPDL_LET) { |