Skip to content

Commit 5ef6407

Browse files
PhilipOakleydscho
authored andcommitted
object-file.c: use size_t for header lengths
Continue walking the code path for the >4GB `hash-object --literally` test. The `hash_object_file_literally()` function internally uses both `hash_object_file()` and `write_object_file_prepare()`. Both function signatures use `unsigned long` rather than `size_t` for the mem buffer sizes. Use `size_t` instead, for LLP64 compatibility. While at it, convert those function's object's header buffer length to `size_t` for consistency. The value is already upcast to `uintmax_t` for print format compatibility. Note: The hash-object test still does not pass. A subsequent commit continues to walk the call tree's lower level hash functions to identify further fixes. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 62a86b8 commit 5ef6407

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

object-file.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1954,7 +1954,7 @@ void *read_object_with_reference(struct repository *r,
19541954
static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_ctx *c,
19551955
const void *buf, unsigned long len,
19561956
struct object_id *oid,
1957-
char *hdr, int *hdrlen)
1957+
char *hdr, size_t *hdrlen)
19581958
{
19591959
algo->init_fn(c);
19601960
git_hash_update(c, hdr, *hdrlen);
@@ -1963,9 +1963,9 @@ static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_c
19631963
}
19641964

19651965
static void write_object_file_prepare(const struct git_hash_algo *algo,
1966-
const void *buf, unsigned long len,
1966+
const void *buf, size_t len,
19671967
enum object_type type, struct object_id *oid,
1968-
char *hdr, int *hdrlen)
1968+
char *hdr, size_t *hdrlen)
19691969
{
19701970
struct git_hash_ctx c;
19711971

@@ -1979,7 +1979,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
19791979
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
19801980
const void *buf, size_t len,
19811981
const char *type, struct object_id *oid,
1982-
char *hdr, int *hdrlen)
1982+
char *hdr, size_t *hdrlen)
19831983
{
19841984
struct git_hash_ctx c;
19851985

@@ -2117,17 +2117,17 @@ int finalize_object_file_flags(const char *tmpfile, const char *filename,
21172117
}
21182118

21192119
static void hash_object_file_literally(const struct git_hash_algo *algo,
2120-
const void *buf, unsigned long len,
2120+
const void *buf, size_t len,
21212121
const char *type, struct object_id *oid)
21222122
{
21232123
char hdr[MAX_HEADER_LEN];
2124-
int hdrlen = sizeof(hdr);
2124+
size_t hdrlen = sizeof(hdr);
21252125

21262126
write_object_file_prepare_literally(algo, buf, len, type, oid, hdr, &hdrlen);
21272127
}
21282128

21292129
void hash_object_file(const struct git_hash_algo *algo, const void *buf,
2130-
unsigned long len, enum object_type type,
2130+
size_t len, enum object_type type,
21312131
struct object_id *oid)
21322132
{
21332133
hash_object_file_literally(algo, buf, len, type_name(type), oid);
@@ -2491,7 +2491,7 @@ int stream_loose_object(struct input_stream *in_stream, size_t len,
24912491
return err;
24922492
}
24932493

2494-
int write_object_file_flags(const void *buf, unsigned long len,
2494+
int write_object_file_flags(const void *buf, size_t len,
24952495
enum object_type type, struct object_id *oid,
24962496
struct object_id *compat_oid_in, unsigned flags)
24972497
{
@@ -2500,7 +2500,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
25002500
const struct git_hash_algo *compat = repo->compat_hash_algo;
25012501
struct object_id compat_oid;
25022502
char hdr[MAX_HEADER_LEN];
2503-
int hdrlen = sizeof(hdr);
2503+
size_t hdrlen = sizeof(hdr);
25042504

25052505
/* Generate compat_oid */
25062506
if (compat) {
@@ -2540,8 +2540,8 @@ int write_object_file_literally(const void *buf, size_t len,
25402540
const struct git_hash_algo *algo = repo->hash_algo;
25412541
const struct git_hash_algo *compat = repo->compat_hash_algo;
25422542
struct object_id compat_oid;
2543-
int hdrlen, status = 0;
2544-
int compat_type = -1;
2543+
size_t hdrlen;
2544+
int status = 0, compat_type = -1;
25452545

25462546
if (compat) {
25472547
compat_type = type_from_string_gently(type, -1, 1);

object-store-ll.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@ void *repo_read_object_file(struct repository *r,
270270
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
271271

272272
void hash_object_file(const struct git_hash_algo *algo, const void *buf,
273-
unsigned long len, enum object_type type,
273+
size_t len, enum object_type type,
274274
struct object_id *oid);
275275

276-
int write_object_file_flags(const void *buf, unsigned long len,
276+
int write_object_file_flags(const void *buf, size_t len,
277277
enum object_type type, struct object_id *oid,
278278
struct object_id *comapt_oid_in, unsigned flags);
279279
static inline int write_object_file(const void *buf, unsigned long len,

0 commit comments

Comments
 (0)