diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-28 10:34:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 10:34:42 -0700 |
commit | ad2d77760434e1650c186c71fa04a8fdbd77266c (patch) | |
tree | e6f51ef4203047bda1d108bed7f3ca35196d8b4c /cache.h | |
parent | 2c608e0f7c1f0fb9fb3e42eb737d7b8543e11400 (diff) | |
parent | ec9d224903053e045d99c36149703501098b021c (diff) | |
download | git-ad2d77760434e1650c186c71fa04a8fdbd77266c.tar.gz |
Merge branch 'nd/pack-ofs-4gb-limit'
"git pack-objects" and "git index-pack" mostly operate with off_t
when talking about the offset of objects in a packfile, but there
were a handful of places that used "unsigned long" to hold that
value, leading to an unintended truncation.
* nd/pack-ofs-4gb-limit:
fsck: use streaming interface for large blobs in pack
pack-objects: do not truncate result in-pack object size on 32-bit systems
index-pack: correct "offset" type in unpack_entry_data()
index-pack: report correct bad object offsets even if they are large
index-pack: correct "len" type in unpack_data()
sha1_file.c: use type off_t* for object_info->disk_sizep
pack-objects: pass length to check_pack_crc() without truncation
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1515,7 +1515,7 @@ struct object_info { /* Request */ enum object_type *typep; unsigned long *sizep; - unsigned long *disk_sizep; + off_t *disk_sizep; unsigned char *delta_base_sha1; struct strbuf *typename; |