Skip to content

Commit 1d57344

Browse files
committed
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.
1 parent 62b9f80 commit 1d57344

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

src/libgit2/pack.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,7 @@ static void pack_index_free(struct git_pack_file *p)
200200
static int pack_index_check_locked(const char *path, struct git_pack_file *p)
201201
{
202202
struct git_pack_idx_header *hdr;
203-
uint32_t version, i, *index;
204-
uint64_t nr = 0;
203+
uint32_t version, nr = 0, i, *index;
205204
void *idx_map;
206205
size_t idx_size;
207206
struct stat st;
@@ -269,7 +268,7 @@ static int pack_index_check_locked(const char *path, struct git_pack_file *p)
269268
* - 20/32-byte SHA of the packfile
270269
* - 20/32-byte SHA file checksum
271270
*/
272-
if (idx_size != (4 * 256 + (nr * (p->oid_size + 4)) + (p->oid_size * 2))) {
271+
if (idx_size != (4 * 256 + ((uint64_t) nr * (p->oid_size + 4)) + (p->oid_size * 2))) {
273272
git_futils_mmap_free(&p->index_map);
274273
return packfile_error("index is corrupted");
275274
}
@@ -287,7 +286,7 @@ static int pack_index_check_locked(const char *path, struct git_pack_file *p)
287286
* variable sized table containing 8-byte entries
288287
* for offsets larger than 2^31.
289288
*/
290-
uint64_t min_size = 8 + (4 * 256) + (nr * (p->oid_size + 4 + 4)) + (p->oid_size * 2);
289+
uint64_t min_size = 8 + (4 * 256) + ((uint64_t)nr * (p->oid_size + 4 + 4)) + (p->oid_size * 2);
291290
uint64_t max_size = min_size;
292291

293292
if (nr)

0 commit comments

Comments
 (0)