summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorClément Pit-Claudel <clement.pitclaudel@live.com>2020-05-13 10:37:05 -0400
committerEli Zaretskii <eliz@gnu.org>2020-05-13 18:53:25 +0300
commit48830c73e77255985685bd2df65f031cd115e069 (patch)
treecacf74fbdd090efb0742037c8f813a0f0c12586e /src
parenta37290a6f965d0e0c13a734e6be973e1bd43bb7f (diff)
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)
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c2
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,
if (CONSP (spec) && EQ (XCAR (spec), Qdisable_eval))
{
enable_eval = false;
- spec = XCAR (XCDR (spec));
+ spec = CONSP (XCDR (spec)) ? XCAR (XCDR (spec)) : Qnil;
}
if (CONSP (spec)