From b88ffd602592d235b96835d2e1b0ffb3358e439e Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 11 Aug 2026 22:15:08 +0800
Subject: [PATCH] emacs31: backport ACE mitigation for bug#80574

https://eshelyaron.com/posts/2026-08-06-emacs-arbitrary-code-execution-returns.html
---
 pkgs/applications/editors/emacs/sources.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 995e28d298e9..884daa40a987 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -111,6 +111,13 @@ in
     variant = "mainline";
     rev = "emacs-31.0.91";
     hash = "sha256-3nvCiLiEtII1C57CLfDIbVqhiwadYViF9Nv32yDtLIQ=";
+    patches = fetchpatch: [
+      (fetchpatch {
+        name = "nullify-read-symbol-shorthands-around-risky-intern-calls-80574.patch";
+        url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8466eb44991707d128110bdc549fad14c8e1d61e";
+        hash = "sha256-SyRCay2MahCJovtzBHA9M1H9hXhtD5IG3ZFSEUwaWlg=";
+      })
+    ];
   });
 
   emacs30 = import ./make-emacs.nix (mkArgs {