summaryrefslogtreecommitdiff
path: root/packfile.c
diff options
context:
space:
mode:
authorJeremy Linton <lintonrjeremy@gmail.com>2018-06-13 14:22:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-13 18:34:27 (GMT)
commitb611396e97cba09c7e1cf900190cf1a9e922546e (patch)
tree8bdebcc0ae44968876d6bfa8381508d124213d3e /packfile.c
parenta42a58d7b62cc1d6301440e81a83feed9d7c118c (diff)
downloadgit-b611396e97cba09c7e1cf900190cf1a9e922546e.zip
git-b611396e97cba09c7e1cf900190cf1a9e922546e.tar.gz
git-b611396e97cba09c7e1cf900190cf1a9e922546e.tar.bz2
packfile: correct zlib buffer handling
The buffer being passed to zlib includes a NUL terminator that git needs to keep in place. unpack_compressed_entry() attempts to detect the case that the source buffer hasn't been fully consumed by checking to see if the destination buffer has been over consumed. This causes a problem, that more recent zlib patches have been poisoning the unconsumed portions of the buffer which overwrites the NUL byte, while correctly returning length and status. Let's place the NUL at the end of the buffer after inflate returns to assure that it doesn't result in problems for git even if its been overwritten by zlib. Signed-off-by: Jeremy Linton <lintonrjeremy@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'packfile.c')
-rw-r--r--packfile.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/packfile.c b/packfile.c
index 4a5fe7a..d555699 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1422,6 +1422,9 @@ static void *unpack_compressed_entry(struct packed_git *p,
return NULL;
}
+ /* versions of zlib can clobber unconsumed portion of outbuf */
+ buffer[size] = '\0';
+
return buffer;
}