summaryrefslogtreecommitdiff
path: root/pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-06-15 18:15:50 -0700
committerMichael Forney <mforney@mforney.org>2019-06-15 18:20:20 -0700
commit52b1cb8097da659fc1fd84cb4d2e6868d8abee10 (patch)
tree46926a253eaac1a683f437fde6421acdef9e5151 /pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
parentce9ba02aa51a3c0b1cfbb91b056e6075c8ded619 (diff)
unzip: Update to 6.0-23 patches from Debian
Diffstat (limited to 'pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch')
-rw-r--r--pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch b/pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
deleted file mode 100644
index 7e15d681..00000000
--- a/pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b2833dbb4beddd027f46d1bea62cdac40ec3b343 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Thu, 16 Jun 2016 22:42:29 -0700
-Subject: [PATCH] fix infinite loop when extracting empty bzip2 data
-
-From 15-cve-2015-7697 in unzip_6.0-16+deb8u2.debian.tar.xz.
----
- extract.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/extract.c b/extract.c
-index d816603..ad8b3f7 100644
---- a/extract.c
-+++ b/extract.c
-@@ -2728,6 +2728,12 @@ __GDEF
- 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;
---
-2.8.1
-