| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame^] | 1 | Upstream-Status: Backport |
| 2 | Signed-off-by: Tudor Florea <tudor.flore@enea.com> |
| 3 | |
| 4 | From bd8a743ee0a77e65ad07ef4196c4cd366add3f26 Mon Sep 17 00:00:00 2001 |
| 5 | From: Kamil Dudka <kdudka@redhat.com> |
| 6 | Date: Mon, 14 Sep 2015 18:24:56 +0200 |
| 7 | Subject: [PATCH 2/2] fix infinite loop when extracting empty bzip2 data |
| 8 | |
| 9 | --- |
| 10 | extract.c | 6 ++++++ |
| 11 | 1 file changed, 6 insertions(+) |
| 12 | |
| 13 | diff --git a/extract.c b/extract.c |
| 14 | index 7134bfe..29db027 100644 |
| 15 | --- a/extract.c |
| 16 | +++ b/extract.c |
| 17 | @@ -2733,6 +2733,12 @@ __GDEF |
| 18 | int repeated_buf_err; |
| 19 | bz_stream bstrm; |
| 20 | |
| 21 | + if (G.incnt <= 0 && G.csize <= 0L) { |
| 22 | + /* avoid an infinite loop */ |
| 23 | + Trace((stderr, "UZbunzip2() got empty input\n")); |
| 24 | + return 2; |
| 25 | + } |
| 26 | + |
| 27 | #if (defined(DLL) && !defined(NO_SLIDE_REDIR)) |
| 28 | if (G.redirect_slide) |
| 29 | wsize = G.redirect_size, redirSlide = G.redirect_buffer; |
| 30 | -- |
| 31 | 2.4.6 |