From: "Clément Pit-Claudel" <cpitclaudel@gmail.com>
To: 41232@debbugs.gnu.org
Subject: bug#41232: [PATCH] Avoid a segfault when processing disable-eval specs
Date: Wed, 13 May 2020 10:40:18 -0400 [thread overview]
Message-ID: <dbd41d66-3506-acda-1cae-eed61d55d3c9@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
The following code causes Emacs to segfault:
(insert (propertize "A" 'display '(disable-eval . nil)))
This is due to this code, which takes an XCAR without checking whether the spec is a cons:
/* Support (disable-eval PROP) which is used by enriched.el. */
if (CONSP (spec) && EQ (XCAR (spec), Qdisable_eval))
{
enable_eval = false;
spec = XCAR (XCDR (spec));
}
The attached patch fixes this.
[-- Attachment #2: 0001-Fix-a-crash-in-handle_display_spec.patch --]
[-- Type: text/x-patch, Size: 886 bytes --]
From b0954112bbe2dc124041a6439a4cc371fd9809fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Pit-Claudel?= <clement.pitclaudel@live.com>
Date: Wed, 13 May 2020 10:37:05 -0400
Subject: [PATCH] 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.
---
src/xdisp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index d65bb38869..cf15f579b5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5120,7 +5120,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)
--
2.17.1
next reply other threads:[~2020-05-13 14:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 14:40 Clément Pit-Claudel [this message]
2020-05-13 15:54 ` bug#41232: [PATCH] Avoid a segfault when processing disable-eval specs Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dbd41d66-3506-acda-1cae-eed61d55d3c9@gmail.com \
--to=cpitclaudel@gmail.com \
--cc=41232@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).