diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-11-04 00:07:04 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-11-04 00:16:36 -0300 |
commit | e143bf83e626231284b6872226b7a83111d6fe36 (patch) | |
tree | 9e296f66c805b869bf250d3867368377ccc768ab /libre/unzip/empty-input.patch | |
parent | 61d267c8d050d81221da8c3f935c79700f81c869 (diff) |
unzip-6.0-11.parabola1: fix FS#46955 -> https://bugs.archlinux.org/task/46955
Diffstat (limited to 'libre/unzip/empty-input.patch')
-rw-r--r-- | libre/unzip/empty-input.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libre/unzip/empty-input.patch b/libre/unzip/empty-input.patch new file mode 100644 index 000000000..45cbe9278 --- /dev/null +++ b/libre/unzip/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; |