summaryrefslogtreecommitdiff
path: root/pkg/unzip/patch/0015-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
blob: b238bf564daa5ebf1139d82519e16198d47c1e50 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
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