diff options
| author | Noam Postavsky | 2020-03-20 04:07:39 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2020-03-22 23:06:31 -0400 |
| commit | 8944310d7c9e259c9611ff2f0004c3176eb0ddab (patch) | |
| tree | 13a0f17f063ecb83481f94166ba7f68b19beeba2 /src/data.c | |
| parent | 8709aaddd8707c9eafb359f9ec824e4bc109bbc6 (diff) | |
| download | emacs-8944310d7c9e259c9611ff2f0004c3176eb0ddab.tar.gz emacs-8944310d7c9e259c9611ff2f0004c3176eb0ddab.zip | |
Don't signal during backtrace unrewind (Bug#40088)
backtrace_eval_unrewind is used to temporarily reverse
let-bindings (it's called with a positive argument to reverse
bindings, and then a negative argument to re-apply them) by
backtrace--locals and backtrace-eval. For the SPECPDL_LET_DEFAULT and
SPECPDL_LET_LOCAL cases (which occur for let-bindings on buffer-local
variables), the code calls Fdefault_value and Fbuffer_local_value on
the symbol.
For symbols which are unbound at top-level, the first (with positive
argument) call to backtrace_eval_unrewind will set the symbol's value
to unbound (putting the current value in the specpdl's "old value"
slot). On the second (with negative argument) call,
backtrace_eval_unrewind attempts to retrieve the symbol's value with
Fdefault_value or Fbuffer_local_value, but that raises a void-variable
signal. This interrupts the restoration of the let-bindings, so any
other variables more recent on the stack will now have the wrong
value.
* src/data.c (default_value): Make non-static.
* src/lisp.h: Declare it.
* src/eval.c (backtrace_eval_unrewind): Replace the calls to
Fdefault_value and Fbuffer_local_value with default_value and
buffer_local_value, respectively. The latter do exactly the same as
the former, except if the symbol's value is Qunbound they just return
it instead of signaling void-variable.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c index b1530688468..5ce5e360ab4 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1573,7 +1573,7 @@ notify_variable_watchers (Lisp_Object symbol, | |||
| 1573 | /* Return the default value of SYMBOL, but don't check for voidness. | 1573 | /* Return the default value of SYMBOL, but don't check for voidness. |
| 1574 | Return Qunbound if it is void. */ | 1574 | Return Qunbound if it is void. */ |
| 1575 | 1575 | ||
| 1576 | static Lisp_Object | 1576 | Lisp_Object |
| 1577 | default_value (Lisp_Object symbol) | 1577 | default_value (Lisp_Object symbol) |
| 1578 | { | 1578 | { |
| 1579 | struct Lisp_Symbol *sym; | 1579 | struct Lisp_Symbol *sym; |