summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorPeriklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>2018-11-01 13:17:01 +0100
committerPeriklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>2018-11-01 13:17:01 +0100
commit84db315fb364972cd4d5687b52adb363900d3d86 (patch)
tree97d193d5422b5308e058b6780bf9ea77f6da49da /pkgs/development/libraries
parent38db6fdfb9672a0206a2042447132094bc05a5ea (diff)
downloadnixlib-84db315fb364972cd4d5687b52adb363900d3d86.tar
nixlib-84db315fb364972cd4d5687b52adb363900d3d86.tar.gz
nixlib-84db315fb364972cd4d5687b52adb363900d3d86.tar.bz2
nixlib-84db315fb364972cd4d5687b52adb363900d3d86.tar.lz
nixlib-84db315fb364972cd4d5687b52adb363900d3d86.tar.xz
nixlib-84db315fb364972cd4d5687b52adb363900d3d86.tar.zst
nixlib-84db315fb364972cd4d5687b52adb363900d3d86.zip
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.patch13
-rw-r--r--pkgs/development/libraries/libid3tag/default.nix5
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+=(