diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2023-03-16 02:48:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 02:48:59 -0700 |
| commit | 1b929b3d8531dbf6326285491e2e17ff4db2c337 (patch) | |
| tree | dc77b5ae849f1aeff5b54d861a867e73df3d42f7 | |
| parent | 8f8e805e3f37e49563c33a0c67fcf7f0d2e9101c (diff) | |
| parent | 1d57344cdf51fe4e610615d9a25eb591a4dacaeb (diff) | |
| download | libgit2-1b929b3d8531dbf6326285491e2e17ff4db2c337.tar.gz | |
Merge pull request #6530 from libgit2/cmn/pack-index-64
pack: use 64 bits for the number of objects
| -rw-r--r-- | src/libgit2/pack.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libgit2/pack.c b/src/libgit2/pack.c index c30801844..d59973aa9 100644 --- a/src/libgit2/pack.c +++ b/src/libgit2/pack.c @@ -200,7 +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, nr, i, *index; + uint32_t version, nr = 0, i, *index; void *idx_map; size_t idx_size; struct stat st; @@ -246,7 +246,6 @@ static int pack_index_check_locked(const char *path, struct git_pack_file *p) version = 1; } - nr = 0; index = idx_map; if (version > 1) @@ -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,8 +286,8 @@ 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. */ - unsigned long min_size = 8 + (4 * 256) + (nr * (p->oid_size + 4 + 4)) + (p->oid_size * 2); - unsigned long max_size = min_size; + 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) max_size += (nr - 1)*8; |