diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 09:33:25 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 09:33:25 +0200 |
| commit | 50fccad5828fb459760fd7578951bb961a18c0fc (patch) | |
| tree | b03fabe68edbdcdbd3d10e0d167f19d9db1d95b3 /pkgs | |
| parent | 60fa61c83041ebad1d32200443f859e6f901eeaf (diff) | |
| parent | cdc5326a31189d596abfcb30b776de8ba3e65569 (diff) | |
| download | nixpkgs-50fccad5828fb459760fd7578951bb961a18c0fc.tar nixpkgs-50fccad5828fb459760fd7578951bb961a18c0fc.tar.gz nixpkgs-50fccad5828fb459760fd7578951bb961a18c0fc.tar.bz2 nixpkgs-50fccad5828fb459760fd7578951bb961a18c0fc.tar.lz nixpkgs-50fccad5828fb459760fd7578951bb961a18c0fc.tar.xz nixpkgs-50fccad5828fb459760fd7578951bb961a18c0fc.tar.zst nixpkgs-50fccad5828fb459760fd7578951bb961a18c0fc.zip | |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/pcre/CVE-2016-1283.patch | 18 | ||||
| -rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pcre/CVE-2016-1283.patch b/pkgs/development/libraries/pcre/CVE-2016-1283.patch new file mode 100644 index 00000000000..2c2dad29e92 --- /dev/null +++ b/pkgs/development/libraries/pcre/CVE-2016-1283.patch @@ -0,0 +1,18 @@ +Index: pcre_compile.c +=================================================================== +--- a/pcre_compile.c (revision 1635) ++++ b/pcre_compile.c (revision 1636) +@@ -7311,7 +7311,12 @@ + so far in order to get the number. If the name is not found, leave + the value of recno as 0 for a forward reference. */ + +- else ++ /* This patch (removing "else") fixes a problem when a reference is ++ to multiple identically named nested groups from within the nest. ++ Once again, it is not the "proper" fix, and it results in an ++ over-allocation of memory. */ ++ ++ /* else */ + { + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e8ff3ef7e5b..8bce1512d13 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -21,8 +21,9 @@ in stdenv.mkDerivation rec { sha256 = "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r"; }; - patches = - [ ]; + patches = [ + ./CVE-2016-1283.patch + ]; outputs = [ "dev" "out" "bin" "doc" "man" ]; |