diff options
| author | Clément Pit-Claudel | 2020-05-13 10:37:05 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2020-05-13 18:53:25 +0300 |
| commit | 48830c73e77255985685bd2df65f031cd115e069 (patch) | |
| tree | cacf74fbdd090efb0742037c8f813a0f0c12586e | |
| parent | a37290a6f965d0e0c13a734e6be973e1bd43bb7f (diff) | |
| download | emacs-48830c73e77255985685bd2df65f031cd115e069.tar.gz emacs-48830c73e77255985685bd2df65f031cd115e069.zip | |
Fix a crash in handle_display_spec
* src/xdisp.c (handle_display_spec): Check that the cdr of the
disable-eval spec is a cons before taking its car. (Bug#41232)
| -rw-r--r-- | src/xdisp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index b0fbc9936fb..1e865898e37 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -5104,7 +5104,7 @@ handle_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, | |||
| 5104 | if (CONSP (spec) && EQ (XCAR (spec), Qdisable_eval)) | 5104 | if (CONSP (spec) && EQ (XCAR (spec), Qdisable_eval)) |
| 5105 | { | 5105 | { |
| 5106 | enable_eval = false; | 5106 | enable_eval = false; |
| 5107 | spec = XCAR (XCDR (spec)); | 5107 | spec = CONSP (XCDR (spec)) ? XCAR (XCDR (spec)) : Qnil; |
| 5108 | } | 5108 | } |
| 5109 | 5109 | ||
| 5110 | if (CONSP (spec) | 5110 | if (CONSP (spec) |