[PATCH v2 5/7] index-pack: correct "offset" type in unpack_entry_data()
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Jul 13, 2016, 15:44 UTC
- Message-ID
- <20160713154404.22909-6-pclouds@gmail.com>
- In-Reply-To
- <20160713154404.22909-1-pclouds@gmail.com>
unpack_entry_data() receives an off_t value from unpack_raw_entry(), which could be larger than unsigned long on 32-bit systems with large file support. Correct the type so truncation does not happen. This only affects bad object reporting though.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/index-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index e2d8ae4..1008d7f 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -430,7 +430,7 @@ static int is_delta_type(enum object_type type) return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA); } -static void *unpack_entry_data(unsigned long offset, unsigned long size, +static void *unpack_entry_data(off_t offset, unsigned long size, enum object_type type, unsigned char *sha1) { static char fixed_buf[8192];
-- 2.9.1.564.gb2f7278