From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 365721F45D for ; Tue, 24 Mar 2020 06:01:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725941AbgCXGB0 (ORCPT ); Tue, 24 Mar 2020 02:01:26 -0400 Received: from cloud.peff.net ([104.130.231.41]:49040 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1725853AbgCXGB0 (ORCPT ); Tue, 24 Mar 2020 02:01:26 -0400 Received: (qmail 15121 invoked by uid 109); 24 Mar 2020 06:01:26 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Tue, 24 Mar 2020 06:01:26 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 21156 invoked by uid 111); 24 Mar 2020 06:11:15 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Tue, 24 Mar 2020 02:11:15 -0400 Authentication-Results: peff.net; auth=none Date: Tue, 24 Mar 2020 02:01:25 -0400 From: Jeff King To: Damien Robert Cc: git@vger.kernel.org, Junio C Hamano , Derrick Stolee , William Baker , Damien Robert Subject: Re: [PATCH v3 1/1] midx.c: fix an integer overflow Message-ID: <20200324060125.GA610977@coredump.intra.peff.net> References: <20200312173520.2401776-1-damien.olivier.robert+git@gmail.com> <20200323222515.779477-1-damien.olivier.robert+git@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200323222515.779477-1-damien.olivier.robert+git@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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