Skip to content

Commit

Permalink
object-file.c: use size_t for header lengths
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
PhilipOakley authored and dscho committed Jun 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent e335a51 commit aac4f01
Showing 2 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions object-file.c
Original file line number Diff line number Diff line change
@@ -1867,7 +1867,7 @@ void *read_object_with_reference(struct repository *r,
static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
const void *buf, unsigned long len,
struct object_id *oid,
char *hdr, int *hdrlen)
char *hdr, size_t *hdrlen)
{
algo->init_fn(c);
algo->update_fn(c, hdr, *hdrlen);
@@ -1876,9 +1876,9 @@ static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
}

static void write_object_file_prepare(const struct git_hash_algo *algo,
const void *buf, unsigned long len,
const void *buf, size_t len,
enum object_type type, struct object_id *oid,
char *hdr, int *hdrlen)
char *hdr, size_t *hdrlen)
{
git_hash_ctx c;

@@ -1892,7 +1892,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
const void *buf, size_t len,
const char *type, struct object_id *oid,
char *hdr, int *hdrlen)
char *hdr, size_t *hdrlen)
{
git_hash_ctx c;

@@ -1944,17 +1944,17 @@ int finalize_object_file(const char *tmpfile, const char *filename)
}

static void hash_object_file_literally(const struct git_hash_algo *algo,
const void *buf, unsigned long len,
const void *buf, size_t len,
const char *type, struct object_id *oid)
{
char hdr[MAX_HEADER_LEN];
int hdrlen = sizeof(hdr);
size_t hdrlen = sizeof(hdr);

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

void hash_object_file(const struct git_hash_algo *algo, const void *buf,
unsigned long len, enum object_type type,
size_t len, enum object_type type,
struct object_id *oid)
{
hash_object_file_literally(algo, buf, len, type_name(type), oid);
@@ -2318,7 +2318,7 @@ int stream_loose_object(struct input_stream *in_stream, size_t len,
return err;
}

int write_object_file_flags(const void *buf, unsigned long len,
int write_object_file_flags(const void *buf, size_t len,
enum object_type type, struct object_id *oid,
struct object_id *compat_oid_in, unsigned flags)
{
@@ -2327,7 +2327,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
const struct git_hash_algo *compat = repo->compat_hash_algo;
struct object_id compat_oid;
char hdr[MAX_HEADER_LEN];
int hdrlen = sizeof(hdr);
size_t hdrlen = sizeof(hdr);

/* Generate compat_oid */
if (compat) {
@@ -2367,8 +2367,8 @@ int write_object_file_literally(const void *buf, size_t len,
const struct git_hash_algo *algo = repo->hash_algo;
const struct git_hash_algo *compat = repo->compat_hash_algo;
struct object_id compat_oid;
int hdrlen, status = 0;
int compat_type = -1;
size_t hdrlen;
int status = 0, compat_type = -1;

if (compat) {
compat_type = type_from_string_gently(type, -1, 1);
4 changes: 2 additions & 2 deletions object-store-ll.h
Original file line number Diff line number Diff line change
@@ -250,10 +250,10 @@ void *repo_read_object_file(struct repository *r,
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);

void hash_object_file(const struct git_hash_algo *algo, const void *buf,
unsigned long len, enum object_type type,
size_t len, enum object_type type,
struct object_id *oid);

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

0 comments on commit aac4f01

Please sign in to comment.