From: Damien Robert <damien.olivier.robert@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <dstolee@microsoft.com>,
William Baker <William.Baker@microsoft.com>
Subject: Re: [PATCH 1/1] midx.c: fix an integer overflow
Date: Sat, 29 Feb 2020 16:38:55 +0100 [thread overview]
Message-ID: <20200229153855.o2s2lv4qiltej4ej@doriath> (raw)
In-Reply-To: <20200228185525.GB1408759@coredump.intra.peff.net>
From Jeff King, Fri 28 Feb 2020 at 13:55:25 (-0500) :
> Makes sense. Such a midx shouldn't be generated in the first place, but
> we should handle it robustly if we do see one.
This midx was actually written by `git multi-pack-index write`, when there
is no pack files in the store.
> for (i = 1; i < m->num_objects; i++) {
> ...
> nth_midxed_object_oid(&oid1, m, i - 1);
> nth_midxed_object_oid(&oid2, m, i);
> ...
> }
We could, but this mean that we have to shift all values of i by one in the
body. My patch has a smaller diff :)
> Though I almost wonder if we should be catching "m->num_objects == 0"
> early and declaring the midx to be bogus
This is probably the best solution. Should I also catch m->num_objects == 1?
Having a midx with only one pack does not make much sense either.
> (it's not _technically_ wrong, but I'd have to suspect a bug in anything
> that generated a 0-object midx file).
So mid.c:926 calls write_midx_header unconditionally.
written = write_midx_header(f, num_chunks, packs.nr - dropped_packs);
Maybe we could check that packs.nr - dropped_packds is > 0 first.
So I can reroll.
- I'll add a warning to verify if there is no pack in the midx. What about
when there is one pack?
- Should I update write_midx_internal to not write anything if there is no
pack? What about if there is only one pack?
- Should I add tests?
--
Damien
next prev parent reply other threads:[~2020-02-29 15:39 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200229153855.o2s2lv4qiltej4ej@doriath \
--to=damien.olivier.robert@gmail.com \
--cc=William.Baker@microsoft.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).