From: Nguyễn Thái Ngọc Duy Date: Wed, 13 Jul 2016 15:44:02 +0000 (+0200) Subject: index-pack: correct "offset" type in unpack_entry_data() X-Git-Tag: v2.9.3~39^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da49a7da3ad5e31fa858a6d48d8a6af9c4690724;p=git index-pack: correct "offset" type in unpack_entry_data() 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/index-pack.c b/builtin/index-pack.c index e2d8ae4a02..1008d7f63c 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];