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>
Jeremy Linton committed
Jun 13, 2018 at 09:22 UTC
b611396e97cba09c7e1cf900190cf1a9e922546e
1 file changed
+3
packfile.c
+3
@@ -1422,6 +1422,9 @@ static void *unpack_compressed_entry(struct packed_git *p,
1422
return NULL;
1423
}
1424
1425
+ /* versions of zlib can clobber unconsumed portion of outbuf */
1426
+ buffer[size] = '\0';
1427
+
1428
return buffer;
1429
}
1430