| From 080d52c3c9416c731f637f9c6e003961ef43f079 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 1/3] Fix bug in undefer_input() that misplaced the input |
| state. |
| |
| CVE: CVE-2019-13232 |
| Upstream-Status: Backport |
| [https://github.com/madler/unzip/commit/41beb477c5744bc396fa1162ee0c14218ec12213] |
| |
| Signed-off-by: Dan Tran <dantran@microsoft.com> |
| --- |
| fileio.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/fileio.c b/fileio.c |
| index 7605a29..14460f3 100644 |
| --- a/fileio.c |
| +++ b/fileio.c |
| @@ -532,8 +532,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; |
| -- |
| 2.22.0.vfs.1.1.57.gbaf16c8 |