diff options
| author | Carlos Martín Nieto <carlosmn@github.com> | 2023-03-16 09:21:37 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <carlosmn@github.com> | 2023-03-16 09:21:37 +0100 |
| commit | 1d57344cdf51fe4e610615d9a25eb591a4dacaeb (patch) | |
| tree | dc77b5ae849f1aeff5b54d861a867e73df3d42f7 | |
| parent | 62b9f803575d261348508c449f8e1698beebb115 (diff) | |
| download | libgit2-1d57344cdf51fe4e610615d9a25eb591a4dacaeb.tar.gz | |
pack: cast to uint64_t when calculating index size instead
It is a bit too hidden why we want 64 bits when we're assigning to a 32-bit
integer later on to store the number of objects, so go back to uint32_t and cast
to uint64_t during the size calculation.
| -rw-r--r-- | src/libgit2/pack.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libgit2/pack.c b/src/libgit2/pack.c index 6e99d4b71..d59973aa9 100644 --- a/src/libgit2/pack.c +++ b/src/libgit2/pack.c @@ -200,8 +200,7 @@ static void pack_index_free(struct git_pack_file *p) static int pack_index_check_locked(const char *path, struct git_pack_file *p) { struct git_pack_idx_header *hdr; - uint32_t version, i, *index; - uint64_t nr = 0; + uint32_t version, nr = 0, i, *index; void *idx_map; size_t idx_size; struct stat st; @@ -269,7 +268,7 @@ static int pack_index_check_locked(const char *path, struct git_pack_file *p) * - 20/32-byte SHA of the packfile * - 20/32-byte SHA file checksum */ - if (idx_size != (4 * 256 + (nr * (p->oid_size + 4)) + (p->oid_size * 2))) { + if (idx_size != (4 * 256 + ((uint64_t) nr * (p->oid_size + 4)) + (p->oid_size * 2))) { git_futils_mmap_free(&p->index_map); return packfile_error("index is corrupted"); } @@ -287,7 +286,7 @@ static int pack_index_check_locked(const char *path, struct git_pack_file *p) * variable sized table containing 8-byte entries * for offsets larger than 2^31. */ - uint64_t min_size = 8 + (4 * 256) + (nr * (p->oid_size + 4 + 4)) + (p->oid_size * 2); + uint64_t min_size = 8 + (4 * 256) + ((uint64_t)nr * (p->oid_size + 4 + 4)) + (p->oid_size * 2); uint64_t max_size = min_size; if (nr) |