diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:41 (GMT) |
| commit | 1cb4b3d380fe42a837adfb68126a312f605680f8 (patch) | |
| tree | a3051c8af64dda52e0c1b0c9826afa0d2d66515c /builtin | |
| parent | 14d4aab3bbd4cb25a4ccd16dc778c4c6c0a77c73 (diff) | |
| parent | a1e920a0a7747f0820e62b22b67fd36fb1d74607 (diff) | |
| download | git-1cb4b3d380fe42a837adfb68126a312f605680f8.zip git-1cb4b3d380fe42a837adfb68126a312f605680f8.tar.gz git-1cb4b3d380fe42a837adfb68126a312f605680f8.tar.bz2 | |
Merge branch 'js/fsck-tag-validation'
New tag object format validation added in 2.2 showed garbage
after a tagname it reported in its error message.
* js/fsck-tag-validation:
index-pack: terminate object buffers with NUL
fsck: properly bound "invalid tag name" error message
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 4 | ||||
| -rw-r--r-- | builtin/unpack-objects.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index a369f55..4632117 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -447,7 +447,7 @@ static void *unpack_entry_data(unsigned long offset, unsigned long size, if (type == OBJ_BLOB && size > big_file_threshold) buf = fixed_buf; else - buf = xmalloc(size); + buf = xmallocz(size); memset(&stream, 0, sizeof(stream)); git_inflate_init(&stream); @@ -552,7 +552,7 @@ static void *unpack_data(struct object_entry *obj, git_zstream stream; int status; - data = xmalloc(consume ? 64*1024 : obj->size); + data = xmallocz(consume ? 64*1024 : obj->size); inbuf = xmalloc((len < 64*1024) ? len : 64*1024); memset(&stream, 0, sizeof(stream)); diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 855d94b..ac66672 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -91,7 +91,7 @@ static void use(int bytes) static void *get_data(unsigned long size) { git_zstream stream; - void *buf = xmalloc(size); + void *buf = xmallocz(size); memset(&stream, 0, sizeof(stream)); |