diff options
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | 2010-01-26 20:24:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-26 13:00:10 -0800 |
| commit | 3aee68aa68e80856de26340b707148d8f8d5b82e (patch) | |
| tree | 34ccbcc121881c3846d35cf5fa5135243c87ae6e /sha1_file.c | |
| parent | 222083a1585c058fd2bbcb76db1ea824ee3df17f (diff) | |
| download | git-3aee68aa68e80856de26340b707148d8f8d5b82e.tar.gz git-3aee68aa68e80856de26340b707148d8f8d5b82e.tar.xz | |
Fix integer overflow in unpack_sha1_rest()
[jc: later NUL termination by the caller becomes unnecessary]
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c index 63981fb3f..a90324767 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; |