| Upstream-Status: Backport |
| CVE: CVE-2015-7697 |
| Signed-off-by: Tudor Florea <tudor.flore@enea.com> |
| |
| From bd8a743ee0a77e65ad07ef4196c4cd366add3f26 Mon Sep 17 00:00:00 2001 |
| From: Kamil Dudka <kdudka@redhat.com> |
| Date: Mon, 14 Sep 2015 18:24:56 +0200 |
| Subject: [PATCH 2/2] 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 7134bfe..29db027 100644 |
| --- a/extract.c |
| +++ b/extract.c |
| @@ -2733,6 +2733,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.4.6 |