diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2018-09-13 11:02:23 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:49:41 -0700 |
| commit | d8ac9ee109ade79783ea398200219960d352f503 (patch) | |
| tree | e7bcbfc7fbdc210e129622e0c128c68b8a0d424a | |
| parent | multi-pack-index: verify oid lookup order (diff) | |
| download | tgif-d8ac9ee109ade79783ea398200219960d352f503.tar.xz | |
multi-pack-index: fix 32-bit vs 64-bit size check
When loading a 64-bit offset, we intend to check that off_t can store
the resulting offset. However, the condition accidentally checks the
32-bit offset to see if it is smaller than a 64-bit value. Fix it,
and this will be covered by a test in the 'git multi-pack-index verify'
command in a later commit.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | midx.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -236,7 +236,7 @@ static off_t nth_midxed_offset(struct multi_pack_index *m, uint32_t pos) offset32 = get_be32(offset_data + sizeof(uint32_t)); if (m->chunk_large_offsets && offset32 & MIDX_LARGE_OFFSET_NEEDED) { - if (sizeof(offset32) < sizeof(uint64_t)) + if (sizeof(off_t) < sizeof(uint64_t)) die(_("multi-pack-index stores a 64-bit offset, but off_t is too small")); offset32 ^= MIDX_LARGE_OFFSET_NEEDED; |