summarylogtreecommitdiffstats
path: root/empty-input.patch
diff options
context:
space:
mode:
authorNatrio2015-11-04 18:11:28 +0300
committerNatrio2015-11-04 18:11:28 +0300
commit11d6e3741e26621265bd0371dbc937e7246f181e (patch)
treefeab542163aafe65e88f2ab82ad2a72438bbebfc /empty-input.patch
parent584df57b04e692adf657ae781ac11d28a193c7de (diff)
downloadaur-unzip-natspec.tar.gz
Update to 6.0-6 (sync patches to unzip 6.0-11)
Diffstat (limited to 'empty-input.patch')
-rw-r--r--empty-input.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/empty-input.patch b/empty-input.patch
new file mode 100644
index 00000000000..45cbe92787c
--- /dev/null
+++ b/empty-input.patch
@@ -0,0 +1,26 @@
+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;