Merge pull request #131926 from NixOS/backport-131609-to-staging-21.05

[Backport staging-21.05] aspell: fix buffer overflow in objstack
This commit is contained in:
Artturi 2021-08-12 05:01:36 +03:00 committed by GitHub
commit ae9890eb6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions

View File

@ -23,7 +23,14 @@ stdenv.mkDerivation rec {
sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr";
};
patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
patches = [
(fetchpatch {
# objstack: assert that the alloc size will fit within a chunk
name = "CVE-2019-25051.patch";
url = "https://github.com/gnuaspell/aspell/commit/0718b375425aad8e54e1150313b862e4c6fd324a.patch";
sha256 = "03z259xrk41x3j190gaprf3mqysyfgh3a04rjmch3h625vj95x39";
})
] ++ lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
postPatch = ''
patch interfaces/cc/aspell.h < ${./clang.patch}