X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=sha1_file.c;h=23d347c45fcf2a93ee59b9ddea996ec432038200;hb=341d9a48cc4a6993f952c5c13417ba88227ef427;hp=63981fb3fd9cfa6cca4126eba5a964b449c62444;hpb=7a4383cf13819cd2ef00f0d60318aad3f1813117;p=git.git diff --git a/sha1_file.c b/sha1_file.c index 63981fb3f..23d347c45 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1232,7 +1232,7 @@ static int unpack_sha1_header(z_stream *stream, unsigned char *map, unsigned lon static void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size, const unsigned char *sha1) { int bytes = strlen(buffer) + 1; - unsigned char *buf = xmalloc(1+size); + unsigned char *buf = xmallocz(size); unsigned long n; int status = Z_OK; @@ -1260,7 +1260,6 @@ static void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size while (status == Z_OK) status = git_inflate(stream, Z_FINISH); } - buf[size] = 0; if (status == Z_STREAM_END && !stream->avail_in) { git_inflate_end(stream); return buf; @@ -1583,8 +1582,7 @@ static void *unpack_compressed_entry(struct packed_git *p, z_stream stream; unsigned char *buffer, *in; - buffer = xmalloc(size + 1); - buffer[size] = 0; + buffer = xmallocz(size); memset(&stream, 0, sizeof(stream)); stream.next_out = buffer; stream.avail_out = size + 1;