From: Clément Pit-Claudel <clement.pitclaudel@live.com>
Date: Wed, 13 May 2020 14:37:05 +0000 (-0400)
Subject: Fix a crash in handle_display_spec
X-Git-Tag: emacs-27.1-rc1~130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48830c73e7;p=emacs.git

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)
---

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)