diff options
author | adisbladis <adis@blad.is> | 2018-01-07 04:25:00 +0800 |
---|---|---|
committer | adisbladis <adis@blad.is> | 2018-01-07 04:25:12 +0800 |
commit | 1aca02b51ef30af68755f5aed7f3ebe5d6ffae48 (patch) | |
tree | 527d0cc55c1905c91a56dd12617e094b8406426b | |
parent | 45f6d97e6e486602cb26a09d13c63619aafbd1b7 (diff) | |
download | nixpkgs-1aca02b51ef30af68755f5aed7f3ebe5d6ffae48.tar nixpkgs-1aca02b51ef30af68755f5aed7f3ebe5d6ffae48.tar.gz nixpkgs-1aca02b51ef30af68755f5aed7f3ebe5d6ffae48.tar.bz2 nixpkgs-1aca02b51ef30af68755f5aed7f3ebe5d6ffae48.tar.lz nixpkgs-1aca02b51ef30af68755f5aed7f3ebe5d6ffae48.tar.xz nixpkgs-1aca02b51ef30af68755f5aed7f3ebe5d6ffae48.tar.zst nixpkgs-1aca02b51ef30af68755f5aed7f3ebe5d6ffae48.zip |
openslp: Fix CVE-2016-4912
-rw-r--r-- | pkgs/development/libraries/openslp/CVE-2016-4912.patch | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/openslp/default.nix | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/pkgs/development/libraries/openslp/CVE-2016-4912.patch new file mode 100644 index 00000000000..06223deda89 --- /dev/null +++ b/pkgs/development/libraries/openslp/CVE-2016-4912.patch @@ -0,0 +1,11 @@ +--- a/common/slp_xmalloc.c ++++ b/common/slp_xmalloc.c +@@ -206,7 +206,7 @@ void * _xrealloc(const char * file, int line, void * ptr, size_t size) + if (newptr == 0) + return 0; + memcpy(newptr, ptr, x->size); +- _xfree(file, line, x); ++ _xfree(file, line, ptr); + } + return newptr; + } diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 3ab3f68cde5..3e178d92013 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { url = "https://src.fedoraproject.org/cgit/rpms/openslp.git/plain/openslp-2.0.0-cve-2016-7567.patch"; sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9"; }) + ./CVE-2016-4912.patch ]; meta = with stdenv.lib; { |