31d289a475
Non-exhaustively fixes CVE-2016-9844, CVE-2018-1000035, CVE-2018-18384, and CVE-2019-13232. * gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch, gnu/packages/patches/unzip-CVE-2016-9844.patch, gnu/packages/patches/unzip-CVE-2018-1000035.patch, gnu/packages/patches/unzip-CVE-2018-18384.patch, gnu/packages/patches/unzip-case-insensitive.patch, gnu/packages/patches/unzip-alt-iconv-utf8-print.patch, gnu/packages/patches/unzip-alt-iconv-utf8.patch, gnu/packages/patches/unzip-close.patch, gnu/packages/patches/unzip-exec-shield.patch, gnu/packages/patches/unzip-fix-recmatch.patch, gnu/packages/patches/unzip-manpage-fix.patch, gnu/packages/patches/unzip-overflow.patch, gnu/packages/patches/unzip-symlink.patch, gnu/packages/patches/unzip-timestamp.patch, gnu/packages/patches/unzip-valgrind.patch, gnu/packages/patches/unzip-x-option.patch, gnu/packages/patches/unzip-zipbomb-manpage.patch, gnu/packages/patches/unzip-zipbomb-part1.patch, gnu/packages/patches/unzip-zipbomb-part2.patch, gnu/packages/patches/unzip-zipbomb-part3.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/compression.scm (unzip/fixed): New variable. Apply patches. (unzip)[replacement]: Graft.
26 lines
1,020 B
Diff
26 lines
1,020 B
Diff
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;
|