From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, michelbach94@gmail.com
Subject: Re: [PATCH 1/5] pack-objects: pass length to check_pack_crc() without truncation
Date: Tue, 12 Jul 2016 10:16:11 -0700 [thread overview]
Message-ID: <xmqqoa626alg.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160705170558.10906-2-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Tue, 5 Jul 2016 19:05:54 +0200")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index 8f5e358..df6ecd5 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -349,7 +349,7 @@ static unsigned long write_reuse_object(struct sha1file *f, struct object_entry
> struct revindex_entry *revidx;
> off_t offset;
> enum object_type type = entry->type;
> - unsigned long datalen;
> + off_t datalen;
> unsigned char header[10], dheader[10];
> unsigned hdrlen;
>
> diff --git a/sha1_file.c b/sha1_file.c
> index d5e1121..cb571ac 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -2281,7 +2281,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
>
> if (do_check_packed_object_crc && p->index_version > 1) {
> struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
> - unsigned long len = revidx[1].offset - obj_offset;
> + off_t len = revidx[1].offset - obj_offset;
> if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr))
It is sad that check_pack_crc() already knew to take off_t here and
we (unknowingly) had a deliberate truncation by using ulong.
Looks obvioiusly correct.
Thanks.
{
> const unsigned char *sha1 =
> nth_packed_object_sha1(p, revidx->nr);
next prev parent reply other threads:[~2016-07-12 17:16 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-24 22:38 [bug] Reliably Reproducible Bad Packing of Objects Christoph Michelbach
2016-07-02 9:10 ` Duy Nguyen
2016-07-02 14:35 ` Duy Nguyen
2016-07-05 17:05 ` [PATCH 0/5] Number truncation with 4+ GB files on 32-bit systems Nguyễn Thái Ngọc Duy
2016-07-05 17:05 ` [PATCH 1/5] pack-objects: pass length to check_pack_crc() without truncation Nguyễn Thái Ngọc Duy
2016-07-12 17:16 ` Junio C Hamano [this message]
2016-07-05 17:05 ` [PATCH 2/5] sha1_file.c: use type off_t* for object_info->disk_sizep Nguyễn Thái Ngọc Duy
2016-07-12 17:20 ` Junio C Hamano
2016-07-12 19:26 ` Junio C Hamano
2016-07-05 17:05 ` [PATCH 3/5] index-pack: correct "len" type in unpack_data() Nguyễn Thái Ngọc Duy
2016-07-05 20:25 ` Johannes Sixt
2016-07-06 15:25 ` Duy Nguyen
2016-07-06 16:04 ` Junio C Hamano
2016-07-06 16:08 ` Junio C Hamano
2016-07-05 17:05 ` [PATCH 4/5] index-pack: report correct bad object offsets even if they are large Nguyễn Thái Ngọc Duy
2016-07-12 17:24 ` Junio C Hamano
2016-07-12 19:27 ` Junio C Hamano
2016-07-05 17:05 ` [PATCH 5/5] index-pack: correct "offset" type in unpack_entry_data() Nguyễn Thái Ngọc Duy
2016-07-05 18:11 ` [PATCH 0/5] Number truncation with 4+ GB files on 32-bit systems Christoph Michelbach
[not found] ` <1467756891.4798.1.camel@gmail.com>
[not found] ` <CACsJy8BDQbanGsf=3z3K-OuH0++EuqQFEB22udXJT+WZnFKSBg@mail.gmail.com>
2016-07-06 18:02 ` Christoph Michelbach
2016-07-06 18:54 ` Duy Nguyen
2016-07-10 10:41 ` Duy Nguyen
2016-07-10 10:42 ` [PATCH 6/5] pack-objects: do not truncate result in-pack object size " Nguyễn Thái Ngọc Duy
2016-07-10 10:45 ` [PATCH 7/5] fsck: use streaming interface for large blobs in pack Nguyễn Thái Ngọc Duy
2016-07-12 18:39 ` Junio C Hamano
2016-07-12 19:06 ` Junio C Hamano
2016-07-12 17:07 ` [PATCH 0/5] Number truncation with 4+ GB files on 32-bit systems Junio C Hamano
2016-07-12 18:48 ` Junio C Hamano
2016-07-12 20:38 ` Junio C Hamano
2016-07-13 6:01 ` Duy Nguyen
2016-07-13 15:43 ` [PATCH v2 0/7] " Nguyễn Thái Ngọc Duy
2016-07-13 15:43 ` [PATCH v2 1/7] pack-objects: pass length to check_pack_crc() without truncation Nguyễn Thái Ngọc Duy
2016-07-13 15:43 ` [PATCH v2 2/7] sha1_file.c: use type off_t* for object_info->disk_sizep Nguyễn Thái Ngọc Duy
2016-07-13 15:44 ` [PATCH v2 3/7] index-pack: correct "len" type in unpack_data() Nguyễn Thái Ngọc Duy
2016-07-13 15:44 ` [PATCH v2 4/7] index-pack: report correct bad object offsets even if they are large Nguyễn Thái Ngọc Duy
2016-07-13 15:44 ` [PATCH v2 5/7] index-pack: correct "offset" type in unpack_entry_data() Nguyễn Thái Ngọc Duy
2016-07-13 15:44 ` [PATCH v2 6/7] pack-objects: do not truncate result in-pack object size on 32-bit systems Nguyễn Thái Ngọc Duy
2016-07-13 15:44 ` [PATCH v2 7/7] fsck: use streaming interface for large blobs in pack Nguyễn Thái Ngọc Duy
2016-07-13 16:16 ` [PATCH v2 0/7] Number truncation with 4+ GB files on 32-bit systems Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqoa626alg.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=michelbach94@gmail.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).