multi-pack-index: verify oid lookup order
Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Sep 13, 2018 at 11:02 UTC
55c5648d804cea734f402c015ec9d2005373804e
2 files changed
+19
midx.c
+11
@@ -959,5 +959,16 @@ int verify_midx_file(const char *object_dir)
959
i, oid_fanout1, oid_fanout2, i + 1);
960
}
961
962
+ for (i = 0; i < m->num_objects - 1; i++) {
963
+ struct object_id oid1, oid2;
964
+
965
+ nth_midxed_object_oid(&oid1, m, i);
966
+ nth_midxed_object_oid(&oid2, m, i + 1);
967
+
968
+ if (oidcmp(&oid1, &oid2) >= 0)
969
+ midx_report(_("oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"),
970
+ i, oid_to_hex(&oid1), oid_to_hex(&oid2), i + 1);
971
+ }
972
+
973
return verify_midx_error;
974
}
t/t5319-multi-pack-index.sh
+8
@@ -175,6 +175,7 @@ test_expect_success 'verify bad signature' '
175
"multi-pack-index signature"
176
'
177
178
+HASH_LEN=20
179
MIDX_BYTE_VERSION=4
180
MIDX_BYTE_OID_VERSION=5
181
MIDX_BYTE_CHUNK_COUNT=6
@@ -189,6 +190,8 @@ MIDX_BYTE_PACKNAME_ORDER=$(($MIDX_OFFSET_PACKNAMES + 2))
190
MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + 652))
191
MIDX_OID_FANOUT_WIDTH=4
192
MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1))
193
+MIDX_OFFSET_OID_LOOKUP=$(($MIDX_OFFSET_OID_FANOUT + 256 * $MIDX_OID_FANOUT_WIDTH))
194
+MIDX_BYTE_OID_LOOKUP=$(($MIDX_OFFSET_OID_LOOKUP + 16 * $HASH_LEN))
195
196
test_expect_success 'verify bad version' '
197
corrupt_midx_and_verify $MIDX_BYTE_VERSION "\00" $objdir \
@@ -235,6 +238,11 @@ test_expect_success 'verify oid fanout out of order' '
238
"oid fanout out of order"
239
'
240
241
+test_expect_success 'verify oid lookup out of order' '
242
+ corrupt_midx_and_verify $MIDX_BYTE_OID_LOOKUP "\00" $objdir \
243
+ "oid lookup out of order"
244
+'
245
+
246
test_expect_success 'repack removes multi-pack-index' '
247
test_path_is_file $objdir/pack/multi-pack-index &&
248
git repack -adf &&