From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id B1F591F404 for ; Wed, 5 Sep 2018 14:46:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727739AbeIETRO (ORCPT ); Wed, 5 Sep 2018 15:17:14 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:47005 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726366AbeIETRO (ORCPT ); Wed, 5 Sep 2018 15:17:14 -0400 Received: by mail-pl1-f196.google.com with SMTP id t19-v6so3399512ply.13 for ; Wed, 05 Sep 2018 07:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=TqKRFE+fCJoDq2SDQU0UV6d4Aa+fl2hYQ339Hk3pocY=; b=IWThUpQIjYzTzBWa24RVNPZ9+NTQaDI1SOJbiVQ8yTvAlEKpTguNwCCa71JJHUYvfj 2H5CmHANo5CNR1wipqp16PWpZyGbf0CDwu8dWxeLTRDSFN+qYVr9CKSOUMxH99WogS7B FZ7LtrsV7zCOltml2s4vvKdrQINj92JCECIEX/bO1Y14dy+Vm2N3o5NasSDiyIm/suuw 6xzcwjxF3hl5CrLIXHBu4Ie2dZ9K+MAFAReSIlXFmJVCqGfnhePmBtc7qMfPxuZLtIvf YKMQtRu4zix+Suoqet5rWlOcfJmk+eu+W+uWhOV9ePcIU1jAQqk0skCzCcn+lQ7+GWdR 2GIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=TqKRFE+fCJoDq2SDQU0UV6d4Aa+fl2hYQ339Hk3pocY=; b=F9D5oDju0w2gisB9gMJPvTwb3p/DHDm776TPW/mz2+SJaUEvxfxj/GogoDJUdd8LJd ZQpiUzqqpWQmIsH2VtEu6ziftffFArCXRh0Wzwnw576IFRnIHApIMgH6G65R8dRxo1Pl WjQdGek/RK5LFge9RRJVJ3WcG8pG84ETM78kueIiZVYtZNPt9qX6bCzmLMpNcUsB9Qy1 3MHOIUB9uCjp2UrpjzNeJZXZFdS/6mOUjXkF4UqplPk4t9Lj0PA8WO+/4Nghx2hQGFPi Q4eVWjgXeDthhCod8CdosEN3y9Bln+B4/6C+W4o6CWGZ6ytEGX4f+XKUTVCw+GcJBjtF I0+A== X-Gm-Message-State: APzg51BmM/RrXGh8gpb2jNueOwJHIly2s0hBhSLK8ijr2iiLKnmb6xgO E0bRpJMtstFhA3GaTop+LzxhsyGs X-Google-Smtp-Source: ANB0VdYc2TYP+B1w0rovTpHZFtcDXeBvVgnL6XlguIUaFe5SuGsWYgx3/UwKiqltxdPzw+gWDsxsjA== X-Received: by 2002:a17:902:7794:: with SMTP id o20-v6mr36051433pll.116.1536158802485; Wed, 05 Sep 2018 07:46:42 -0700 (PDT) Received: from [127.0.0.1] ([40.112.142.204]) by smtp.gmail.com with ESMTPSA id b1-v6sm3308686pgi.91.2018.09.05.07.46.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 07:46:41 -0700 (PDT) Date: Wed, 05 Sep 2018 07:46:41 -0700 (PDT) X-Google-Original-Date: Wed, 05 Sep 2018 14:46:25 GMT Message-Id: In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Subject: [PATCH 07/11] multi-pack-index: verify oid lookup order Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: avarab@gmail.com, Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee Signed-off-by: Derrick Stolee --- midx.c | 11 +++++++++++ t/t5319-multi-pack-index.sh | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/midx.c b/midx.c index dfd26b4d74..06d5cfc826 100644 --- a/midx.c +++ b/midx.c @@ -959,5 +959,16 @@ int verify_midx_file(const char *object_dir) i, oid_fanout1, oid_fanout2, i + 1); } + for (i = 0; i < m->num_objects - 1; i++) { + struct object_id oid1, oid2; + + nth_midxed_object_oid(&oid1, m, i); + nth_midxed_object_oid(&oid2, m, i + 1); + + if (oidcmp(&oid1, &oid2) >= 0) + midx_report(_("oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"), + i, oid_to_hex(&oid1), oid_to_hex(&oid2), i + 1); + } + return verify_midx_error; } diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh index 95ac7a6edd..072b1d1a74 100755 --- a/t/t5319-multi-pack-index.sh +++ b/t/t5319-multi-pack-index.sh @@ -175,6 +175,7 @@ test_expect_success 'verify bad signature' ' "multi-pack-index signature" ' +HASH_LEN=20 MIDX_BYTE_VERSION=4 MIDX_BYTE_OID_VERSION=5 MIDX_BYTE_CHUNK_COUNT=6 @@ -189,6 +190,8 @@ MIDX_BYTE_PACKNAME_ORDER=$(($MIDX_OFFSET_PACKNAMES + 2)) MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + 652)) MIDX_OID_FANOUT_WIDTH=4 MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1)) +MIDX_OFFSET_OID_LOOKUP=$(($MIDX_OFFSET_OID_FANOUT + 256 * $MIDX_OID_FANOUT_WIDTH)) +MIDX_BYTE_OID_LOOKUP=$(($MIDX_OFFSET_OID_LOOKUP + 16 * $HASH_LEN)) test_expect_success 'verify bad version' ' corrupt_midx_and_verify $MIDX_BYTE_VERSION "\00" $objdir \ @@ -235,6 +238,11 @@ test_expect_success 'verify oid fanout out of order' ' "oid fanout out of order" ' +test_expect_success 'verify oid lookup out of order' ' + corrupt_midx_and_verify $MIDX_BYTE_OID_LOOKUP "\00" $objdir \ + "oid lookup out of order" +' + test_expect_success 'repack removes multi-pack-index' ' test_path_is_file $objdir/pack/multi-pack-index && git repack -adf && -- gitgitgadget