From: Jeff King <peff@peff.net>
To: Damien Robert <damien.olivier.robert@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <dstolee@microsoft.com>,
William Baker <William.Baker@microsoft.com>,
Damien Robert <damien.olivier.robert+git@gmail.com>
Subject: Re: [PATCH v3 1/1] midx.c: fix an integer overflow
Date: Tue, 24 Mar 2020 02:01:25 -0400 [thread overview]
Message-ID: <20200324060125.GA610977@coredump.intra.peff.net> (raw)
In-Reply-To: <20200323222515.779477-1-damien.olivier.robert+git@gmail.com>
On Mon, Mar 23, 2020 at 11:25:15PM +0100, Damien Robert wrote:
> When verifying a midx index with 0 objects, the
> m->num_objects - 1
> overflows to 4294967295.
>
> Fix this both by checking that the midx contains at least one oid,
> and also that we don't write any midx when there is no packfiles.
>
> Update the tests so that we check that `git multi-pack-index write` does
> not write an midx when there is no object.
Thanks, both sides of this make sense.
> ---
> Since I did not receive any guidelines, I did not upload an midx with no
> object to check in the tests. I just modified the current tests to check
> that we don't produce an midx if there is no objects.
I'd be OK with just this, but adding a binary t/t5319/zero-objs.midx
would be fine by me, too.
One minor style nit:
> @@ -1124,6 +1130,13 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
> i, oid_fanout1, oid_fanout2, i + 1);
> }
>
> + if (m->num_objects == 0) {
> + midx_report(_("the midx contains no oid"));
> + // remaining tests assume that we have objects, so we can
> + // return here
> + return verify_midx_error;
> + }
We prefer /**/ for comments, like:
/*
* Remaining tests assume that we have objects, so we can
* return here.
*/
-Peff
next prev parent reply other threads:[~2020-03-24 6:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 16:24 [PATCH 1/1] midx.c: fix an integer overflow Damien Robert
2020-02-28 18:55 ` Jeff King
2020-02-28 20:39 ` Junio C Hamano
2020-02-29 17:15 ` Damien Robert
2020-02-29 15:38 ` Damien Robert
2020-03-12 17:35 ` [PATCH v2 " Damien Robert
2020-03-12 18:24 ` Damien Robert
2020-03-12 18:28 ` Derrick Stolee
2020-03-12 21:41 ` Damien Robert
2020-03-23 22:25 ` [PATCH v3 " Damien Robert
2020-03-24 6:01 ` Jeff King [this message]
2020-03-24 18:48 ` Junio C Hamano
2020-03-26 21:35 ` [PATCH v4 " Damien Robert
2020-03-26 23:27 ` Junio C Hamano
2020-03-28 22:23 ` Damien Robert
2020-03-28 23:51 ` Junio C Hamano
2020-03-28 22:18 ` [PATCH 1/1] midx.c: fix an integer underflow Damien Robert
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=20200324060125.GA610977@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=William.Baker@microsoft.com \
--cc=damien.olivier.robert+git@gmail.com \
--cc=damien.olivier.robert@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).