diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2018-11-03 19:52:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 19:52:23 +0900 |
| commit | 0e6d023b0681a22a3b112c194ec0525a163acf2c (patch) | |
| tree | a14c5a5c70f0a893b3b744931aff23b51b95bf38 /pkgs/development/libraries | |
| parent | 5443b3707ff97cdef44c1684072890b8e38c0e1c (diff) | |
| parent | 84db315fb364972cd4d5687b52adb363900d3d86 (diff) | |
| download | nixlib-0e6d023b0681a22a3b112c194ec0525a163acf2c.tar nixlib-0e6d023b0681a22a3b112c194ec0525a163acf2c.tar.gz nixlib-0e6d023b0681a22a3b112c194ec0525a163acf2c.tar.bz2 nixlib-0e6d023b0681a22a3b112c194ec0525a163acf2c.tar.lz nixlib-0e6d023b0681a22a3b112c194ec0525a163acf2c.tar.xz nixlib-0e6d023b0681a22a3b112c194ec0525a163acf2c.tar.zst nixlib-0e6d023b0681a22a3b112c194ec0525a163acf2c.zip | |
Merge pull request #49585 from periklis/libid3tag-sec-fixes
libid3tag: patch CVE-2017-11550 and CVE-2017-11551
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/libid3tag/default.nix | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch new file mode 100644 index 000000000000..b1f9d0978cec --- /dev/null +++ b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch @@ -0,0 +1,13 @@ +Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++ +diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c +--- libid3tag-0.15.1b/utf16.c 2004-01-23 10:41:32.000000000 +0100 ++++ libid3tag-0.15.1b-patched/utf16.c 2018-11-01 13:12:00.866050641 +0100 +@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by + id3_ucs4_t *ucs4; + + end = *ptr + (length & ~1); ++ if (end == *ptr) ++ return 0; + + utf16 = malloc((length / 2 + 1) * sizeof(*utf16)); + if (utf16 == 0) diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 0289a5331f89..4b7d9bdc2e32 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib gperf ]; - patches = [ ./debian-patches.patch ]; + patches = [ + ./debian-patches.patch + ./CVE-2017-11550-and-CVE-2017-11551.patch + ]; preConfigure = '' configureFlagsArray+=( |