[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 48830c7: Fix a crash in handle_display_spec
From: |
Eli Zaretskii |
Subject: |
emacs-27 48830c7: Fix a crash in handle_display_spec |
Date: |
Wed, 13 May 2020 11:54:20 -0400 (EDT) |
branch: emacs-27
commit 48830c73e77255985685bd2df65f031cd115e069
Author: Clément Pit-Claudel <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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)
---
src/xdisp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index b0fbc99..1e86589 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 48830c7: Fix a crash in handle_display_spec,
Eli Zaretskii <=