Merge branch 'jk/detect-truncated-zlib-input' into maint

diff --git a/sha1-file.c b/sha1-file.c
index 2edf4564f6c12f33c59a101470cd2964774fcc34..03b86aec710c3afffcd989bd357d28241a0271a7 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -2191,7 +2191,8 @@ static int check_stream_sha1(git_zstream *stream,
         * see the comment in unpack_sha1_rest for details.
         */
        while (total_read <= size &&
-              (status == Z_OK || status == Z_BUF_ERROR)) {
+              (status == Z_OK ||
+               (status == Z_BUF_ERROR && !stream->avail_out))) {
                stream->next_out = buf;
                stream->avail_out = sizeof(buf);
                if (size - total_read < stream->avail_out)