X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=unzip%2Fpatches%2Funzip-zipbomb-part1.patch;fp=unzip%2Fpatches%2Funzip-zipbomb-part1.patch;h=35cf85652294738510b138aa7029969a480a5778;hb=f57a528060244ef159467d3ba671f5a360ee450d;hp=0000000000000000000000000000000000000000;hpb=2bccf29a53cdfcfdaa6cffd88ddb17638abffb8f;p=people%2Fstevee%2Fipfire-3.x.git

diff --git a/unzip/patches/unzip-zipbomb-part1.patch b/unzip/patches/unzip-zipbomb-part1.patch
new file mode 100644
index 000000000..35cf85652
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-part1.patch
@@ -0,0 +1,25 @@
+From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 27 May 2019 08:20:32 -0700
+Subject: [PATCH] Fix bug in undefer_input() that misplaced the input state.
+
+---
+ fileio.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fileio.c b/fileio.c
+index c042987..bc00d74 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -530,8 +530,10 @@ void undefer_input(__G)
+          * This condition was checked when G.incnt_leftover was set > 0 in
+          * defer_leftover_input(), and it is NOT allowed to touch G.csize
+          * before calling undefer_input() when (G.incnt_leftover > 0)
+-         * (single exception: see read_byte()'s  "G.csize <= 0" handling) !!
++         * (single exception: see readbyte()'s  "G.csize <= 0" handling) !!
+          */
++        if (G.csize < 0L)
++            G.csize = 0L;
+         G.incnt = G.incnt_leftover + (int)G.csize;
+         G.inptr = G.inptr_leftover - (int)G.csize;
+         G.incnt_leftover = 0;