diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-07-13 17:44:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 09:14:38 -0700 |
| commit | 7171a0b0cf5792fd549b601c84b274cd5e4155ed (patch) | |
| tree | 3a0061b7c9ee43c643b6a5e789c43e43876cb958 | |
| parent | 166df26f2821ea23b7c269a32fd63be43a2a0bb9 (diff) | |
| download | git-7171a0b0cf5792fd549b601c84b274cd5e4155ed.tar.gz | |
index-pack: correct "len" type in unpack_data()
On 32-bit systems with large file support, one entry could be larger
than 4GB and overflow "len". Correct it so we can unpack a full entry.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/index-pack.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index e8c71fc1d2..cafaab7b13 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -549,13 +549,13 @@ static void *unpack_data(struct object_entry *obj, void *cb_data) { off_t from = obj[0].idx.offset + obj[0].hdr_size; - unsigned long len = obj[1].idx.offset - from; + off_t len = obj[1].idx.offset - from; unsigned char *data, *inbuf; git_zstream stream; int status; data = xmallocz(consume ? 64*1024 : obj->size); - inbuf = xmalloc((len < 64*1024) ? len : 64*1024); + inbuf = xmalloc((len < 64*1024) ? (int)len : 64*1024); memset(&stream, 0, sizeof(stream)); git_inflate_init(&stream); @@ -563,15 +563,15 @@ static void *unpack_data(struct object_entry *obj, stream.avail_out = consume ? 64*1024 : obj->size; do { - ssize_t n = (len < 64*1024) ? len : 64*1024; + ssize_t n = (len < 64*1024) ? (ssize_t)len : 64*1024; n = xpread(get_thread_data()->pack_fd, inbuf, n, from); if (n < 0) die_errno(_("cannot pread pack file")); if (!n) - die(Q_("premature end of pack file, %lu byte missing", - "premature end of pack file, %lu bytes missing", - len), - len); + die(Q_("premature end of pack file, %"PRIuMAX" byte missing", + "premature end of pack file, %"PRIuMAX" bytes missing", + (unsigned int)len), + (uintmax_t)len); from += n; len -= n; stream.next_in = inbuf; |