Merge branch 'es/make-no-iconv'

diff --git a/packfile.c b/packfile.c
index 1a714fbde994f8b4a7bde68f1fcad1725970fe9b..7cd45aa4b2a0e098d597e4dea633d9b097b9b94c 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1454,6 +1454,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;
 }