multi-pack-index: verify oid fanout 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
2f23d3f3f92dddfdb524203d0993e052b7d9e20e
2 files changed
+17
midx.c
+9
@@ -950,5 +950,14 @@ int verify_midx_file(const char *object_dir)
950
midx_report("failed to load pack in position %d", i);
951
}
952
953
+ for (i = 0; i < 255; i++) {
954
+ uint32_t oid_fanout1 = ntohl(m->chunk_oid_fanout[i]);
955
+ uint32_t oid_fanout2 = ntohl(m->chunk_oid_fanout[i + 1]);
956
+
957
+ if (oid_fanout1 > oid_fanout2)
958
+ midx_report(_("oid fanout out of order: fanout[%d] = %"PRIx32" > %"PRIx32" = fanout[%d]"),
959
+ i, oid_fanout1, oid_fanout2, i + 1);
960
+ }
961
+
962
return verify_midx_error;
963
}
t/t5319-multi-pack-index.sh
+8
@@ -186,6 +186,9 @@ MIDX_CHUNK_LOOKUP_WIDTH=12
186
MIDX_OFFSET_PACKNAMES=$(($MIDX_HEADER_SIZE + \
187
$MIDX_NUM_CHUNKS * $MIDX_CHUNK_LOOKUP_WIDTH))
188
MIDX_BYTE_PACKNAME_ORDER=$(($MIDX_OFFSET_PACKNAMES + 2))
189
+MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + 652))
190
+MIDX_OID_FANOUT_WIDTH=4
191
+MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1))
192
193
test_expect_success 'verify bad version' '
194
corrupt_midx_and_verify $MIDX_BYTE_VERSION "\00" $objdir \
@@ -227,6 +230,11 @@ test_expect_success 'verify packnames out of order' '
230
"failed to load pack"
231
'
232
233
+test_expect_success 'verify oid fanout out of order' '
234
+ corrupt_midx_and_verify $MIDX_BYTE_OID_FANOUT_ORDER "\01" $objdir \
235
+ "oid fanout out of order"
236
+'
237
+
238
test_expect_success 'repack removes multi-pack-index' '
239
test_path_is_file $objdir/pack/multi-pack-index &&
240
git repack -adf &&