summary refs log tree commit diff
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authoralyaeanyx <alexandra.hollmeier@mailbox.org>2021-11-14 21:16:55 +0100
committeralyaeanyx <alexandra.hollmeier@mailbox.org>2021-11-14 21:16:55 +0100
commit200ffaa0727c1f5c09f2f76fdf1a607b6c83d0ec (patch)
tree71344b2314d87702deee3b941f53271274ede901 /pkgs/tools/compression
parent47a9d5e419a32c41b0e0e3d650acdf312372a7b3 (diff)
downloadnixpkgs-200ffaa0727c1f5c09f2f76fdf1a607b6c83d0ec.tar
nixpkgs-200ffaa0727c1f5c09f2f76fdf1a607b6c83d0ec.tar.gz
nixpkgs-200ffaa0727c1f5c09f2f76fdf1a607b6c83d0ec.tar.bz2
nixpkgs-200ffaa0727c1f5c09f2f76fdf1a607b6c83d0ec.tar.lz
nixpkgs-200ffaa0727c1f5c09f2f76fdf1a607b6c83d0ec.tar.xz
nixpkgs-200ffaa0727c1f5c09f2f76fdf1a607b6c83d0ec.tar.zst
nixpkgs-200ffaa0727c1f5c09f2f76fdf1a607b6c83d0ec.zip
bsdiff: fix patch
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/bsdiff/CVE-2020-14315.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/compression/bsdiff/CVE-2020-14315.patch b/pkgs/tools/compression/bsdiff/CVE-2020-14315.patch
index dabb8deee00..bb7ff41284e 100644
--- a/pkgs/tools/compression/bsdiff/CVE-2020-14315.patch
+++ b/pkgs/tools/compression/bsdiff/CVE-2020-14315.patch
@@ -31,7 +31,7 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964796
   * Copyright 2003-2005 Colin Percival
   * All rights reserved
   *
-@@ -24,56 +26,149 @@
+@@ -24,56 +26,148 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
@@ -97,7 +97,7 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964796
 +{
 +	off_t result;
 +
-+#if __GNUC__ >= 5 || \
++#if __GNUC__ >= 5
 +	if (__builtin_add_overflow(a, b, &result))
 +		errx(1, "Corrupt patch");
 +#else