From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: =?UTF-8?Q?Cl=C3=A9ment?= Pit-Claudel Newsgroups: gmane.emacs.bugs Subject: bug#41232: [PATCH] Avoid a segfault when processing disable-eval specs Date: Wed, 13 May 2020 10:40:18 -0400 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------B80AE32BCCC8121CAA9676B6" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="31628"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 To: 41232@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed May 13 16:41:22 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jYsZV-00088y-FF for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 13 May 2020 16:41:21 +0200 Original-Received: from localhost ([::1]:54584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYsZT-0001pg-T2 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 13 May 2020 10:41:19 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYsZC-0001pR-Hk for bug-gnu-emacs@gnu.org; Wed, 13 May 2020 10:41:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:47495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jYsZC-0004ZV-8l for bug-gnu-emacs@gnu.org; Wed, 13 May 2020 10:41:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jYsZC-0004dz-4s for bug-gnu-emacs@gnu.org; Wed, 13 May 2020 10:41:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Pit-Claudel Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 May 2020 14:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41232 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs Original-Received: via spool by submit@debbugs.gnu.org id=B.158938082517797 (code B ref -1); Wed, 13 May 2020 14:41:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 May 2020 14:40:25 +0000 Original-Received: from localhost ([127.0.0.1]:59041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYsYb-0004cz-87 for submit@debbugs.gnu.org; Wed, 13 May 2020 10:40:25 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:53642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYsYZ-0004cr-0h for submit@debbugs.gnu.org; Wed, 13 May 2020 10:40:23 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYsYY-0001m5-Pl for bug-gnu-emacs@gnu.org; Wed, 13 May 2020 10:40:22 -0400 Original-Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:38992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jYsYX-0004G8-RO for bug-gnu-emacs@gnu.org; Wed, 13 May 2020 10:40:22 -0400 Original-Received: by mail-qk1-x731.google.com with SMTP id a136so8579374qkg.6 for ; Wed, 13 May 2020 07:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:autocrypt:subject:message-id:date:user-agent:mime-version :content-language; bh=dIz1wDJ5ATEeknoNqWjmPfuoCQbwR5fiOITIfEi53Gg=; b=eS/8WgeIGe+NqKkXDnW5EJdohc9jsIyHBscmhlmmcq3k2ClwdPyl1hJK5OgTpfcoxl vyatimkW3zAVJWQzpRsYtmEPx1SPpJJ1xwhPH3nWUZQmElCc0uD135yDhQkdZKoKwwCH 2axEwO+I0//1pOgzjaa1+PaxijD7pLBL9ImPBxDRbLX9rTrLH9NbCiiAxnS+PeZe4B4W IoDAqgJB0pPeI1/V9d9NLS+3RYDv1+YNOiStzvL4DwQv1Q9hcaCsL6LaS/Lfwk1OKjWb ibQSxD3SFdy9I5KsW9f0aPlgO96Gr8eYxfwUVzteLVPja1DTq7TedHSZ62AbK2yllP76 UihQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:autocrypt:subject:message-id:date :user-agent:mime-version:content-language; bh=dIz1wDJ5ATEeknoNqWjmPfuoCQbwR5fiOITIfEi53Gg=; b=TdWchXJqcKjQxfM6/TrarLrIPCTf8dTDp26WqT67LgpmomTW9iriHNBYS1ce5T+v5Q WmDb8xezOGk8y6b2aAc6sOPlJiJCOig3tXPUxTGInqmwTbuLPuvLExF/CAXg1DNPAOQM qcsCquORb5xdtpxI0k1ghiyqIxeRXkGq2zewkfZjLyLc7BhJVUkJJg7yU/NdVoTqN56O fMYxjUeeR+iMRP8Pa4IcA2bz2wrWapjH0ge1FjYPJmI5x6xUJI5o/L7/Bu+vcmZ9NfEq 6rv4V8CyhZlfMKyL6/Hysxhtjjpsa0fqyK9g5lJujhFtjaukNTRBXrVL3IoPbe2/XICN sVXg== X-Gm-Message-State: AOAM533l7+yL/t89F7ZfZCO4gOqGUwjCQZ4tiUMRPb+4wTuMFCgsOX5p 2xcqUSgG80gkSt1UeJgaoW3IYYvocSM= X-Google-Smtp-Source: ABdhPJxzf9NMj/a2Zu36MrNF3vGRxAUaxeSEENJu8dxNdIUOPPic2hnsjb9qQirbTnkxZ1YpgOcAOw== X-Received: by 2002:a37:7403:: with SMTP id p3mr1274300qkc.339.1589380820614; Wed, 13 May 2020 07:40:20 -0700 (PDT) Original-Received: from ?IPv6:2601:184:4180:66e7:4d17:b25e:8d9:2188? ([2601:184:4180:66e7:4d17:b25e:8d9:2188]) by smtp.googlemail.com with ESMTPSA id h33sm15871873qtc.21.2020.05.13.07.40.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2020 07:40:19 -0700 (PDT) Autocrypt: addr=clement.pitclaudel@live.com; prefer-encrypt=mutual; keydata= xsFNBFStGiEBEAC8eHa+DdcrVtDSwYoIgoUtMfRAan4bdLxZuNIASy6iFytCHNsKqfPkq8zD YV2+uMtbdcnjapE038nidEMItNhO04JdZ+PJ6jvJo1gW+XI4fM8uzkGZauwR+d3hEq6goFSp rIlSlaVf2g5q4OKxI754yqwz00++EZhZQMntzoKQVV9stJ5eQ+gxTT1ANr7wQKbjn/8PM/Cg hBZvYLhh+WsS0Ko5qZuWdsvUBLpprmCWkP4FpZ234/tWpdVID65nlHpu25+6ajIcxfCIK+dN 2br0wN1szTeQFG19cfr3jXEvwHmLQbQqCg4UH+2b7JpMGR2/KWjqRWfWVvZMPVeJdOsZHx53 k6HIbEhvFBHbmqCI6FAZQjkgzGGkrSD92+jeMYiCTxRKqq2hFZ6xqQ6pJdXD1TXcIYPEs7rA MwcNMj8g4e6vuI+2CjHyQQkyMPAEi8guNPnyfBb648f1lxj7JiJu/ehRghIP5u/kLOsHNCKG QgCT04sawBZYHqEVYni8oHlGJcdWGT5/UI4B+wn70eXvYSScZEaB+S2s/bD0cdlSpHY5Od3l tpRZTva+ydswlrz4fxbYF45s6rFpqVwBMfNv3gqhBFXbuiEEctcTSGqhHxxT4R+24Yn+ZSBa EfUbrKnVTUmV20k+57rghiVw2wpj8v7sn3QXt96HJ9ImY4JvuwARAQABzTNDbMOpbWVudCBQ aXQtLUNsYXVkZWwgPGNsZW1lbnQucGl0Y2xhdWRlbEBsaXZlLmNvbT7CwXsEEwECACUCGyMG CwkIBwMC Content-Language: en-GB Received-SPF: pass client-ip=2607:f8b0:4864:20::731; envelope-from=cpitclaudel@gmail.com; helo=mail-qk1-x731.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:180154 Archived-At: This is a multi-part message in MIME format. --------------B80AE32BCCC8121CAA9676B6 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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. --------------B80AE32BCCC8121CAA9676B6 Content-Type: text/x-patch; charset=UTF-8; name="0001-Fix-a-crash-in-handle_display_spec.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-Fix-a-crash-in-handle_display_spec.patch" =46rom b0954112bbe2dc124041a6439a4cc371fd9809fd Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Cl=3DC3=3DA9ment=3D20Pit-Claudel?=3D 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 spe= c, Lisp_Object object, if (CONSP (spec) && EQ (XCAR (spec), Qdisable_eval)) { enable_eval =3D false; - spec =3D XCAR (XCDR (spec)); + spec =3D CONSP (XCDR (spec)) ? XCAR (XCDR (spec)) : Qnil; } =20 if (CONSP (spec) --=20 2.17.1 --------------B80AE32BCCC8121CAA9676B6--