From a406844445dcfb2e82ea7fb5c58b2b89d2dd9943 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 20 Feb 2022 20:26:47 +0100
Subject: [PATCH] libxslt: Fix use-after-free in xsltApplyTemplates

Fixes: CVE-2021-30560
(cherry picked from commit 54806020fa4f85a73d5580d5c3d1faaca1785286)
---
 pkgs/development/libraries/libxslt/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index eb23e16d653a..dcbd29fc9678 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl
+{ lib, stdenv, fetchurl, fetchpatch
 , pkg-config
 , libxml2, findXMLCatalogs, gettext, python3, libgcrypt
 , cryptoSupport ? false
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
     sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq";
   };
 
+  patches = [
+    (fetchpatch {
+      # Fixes use-after-free in xsltApplyTemplates
+      name = "CVE-2021-30560.patch";
+      url = "https://gitlab.gnome.org/GNOME/libxslt/-/commit/50f9c9cd3b7dfe9b3c8c795247752d1fdcadcac8.patch";
+      sha256 = "sha256-XJD9SBo8xzztQQ6g13h4IzID7HV7u3xWSQdb2rVCJBQ=";
+    })
+  ];
+
   outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py";
 
   nativeBuildInputs = [