summaryrefslogtreecommitdiff
path: root/pkg/unzip/patch/0015-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/unzip/patch/0015-fix-infinite-loop-when-extracting-empty-bzip2-data.patch')
-rw-r--r--pkg/unzip/patch/0015-fix-infinite-loop-when-extracting-empty-bzip2-data.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/pkg/unzip/patch/0015-fix-infinite-loop-when-extracting-empty-bzip2-data.patch b/pkg/unzip/patch/0015-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
new file mode 100644
index 00000000..b238bf56
--- /dev/null
+++ b/pkg/unzip/patch/0015-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
@@ -0,0 +1,29 @@
+From e646271050da793fe50fe829b465c4e692fb7d53 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 14 Sep 2015 18:24:56 +0200
+Subject: [PATCH] fix infinite loop when extracting empty bzip2 data
+
+---
+ extract.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/extract.c b/extract.c
+index f951b9f..188f1cf 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2729,6 +2729,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.20.1
+