diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-22 17:10:41 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-22 17:10:41 -0400 |
| commit | 2442e69e4182b592757dad473c8c7b1c48ca8284 (patch) | |
| tree | 7180454106c234d84cfe2e720550db826c091f72 /gnu/packages/patches/unzip-CVE-2015-7697.patch | |
| parent | c46c931ecfe7fd4a5cbd979263d28d3f1e02bcca (diff) | |
| download | guix-2442e69e4182b592757dad473c8c7b1c48ca8284.tar guix-2442e69e4182b592757dad473c8c7b1c48ca8284.tar.gz | |
Revert "gnu: unzip: Reorganize security fixes for improved clarity."
This reverts commit c46c931ecfe7fd4a5cbd979263d28d3f1e02bcca.
Diffstat (limited to 'gnu/packages/patches/unzip-CVE-2015-7697.patch')
| -rw-r--r-- | gnu/packages/patches/unzip-CVE-2015-7697.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/gnu/packages/patches/unzip-CVE-2015-7697.patch b/gnu/packages/patches/unzip-CVE-2015-7697.patch deleted file mode 100644 index d688b42495..0000000000 --- a/gnu/packages/patches/unzip-CVE-2015-7697.patch +++ /dev/null @@ -1,28 +0,0 @@ -Copied from Debian. - -From: Kamil Dudka <kdudka@redhat.com> -Date: Mon, 14 Sep 2015 18:24:56 +0200 -Subject: fix infinite loop when extracting empty bzip2 data -Bug-Debian: https://bugs.debian.org/802160 -Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944 -Origin: other, https://bugzilla.redhat.com/attachment.cgi?id=1073339 - ---- - extract.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/extract.c -+++ b/extract.c -@@ -2728,6 +2728,12 @@ - int repeated_buf_err; - bz_stream bstrm; - -+ if (G.incnt <= 0 && G.csize <= 0L) { -+ /* avoid an infinite loop */ -+ Trace((stderr, "UZbunzip2() got empty input\n")); -+ return 2; -+ } -+ - #if (defined(DLL) && !defined(NO_SLIDE_REDIR)) - if (G.redirect_slide) - wsize = G.redirect_size, redirSlide = G.redirect_buffer; |