Skip to content

Commit

Permalink
write_object_file_literally(): use size_t
Browse files Browse the repository at this point in the history
The previous commit adds a test that demonstrates a problem in the
`hash-object --literally` command, manifesting in an unnecessary file
size limit on systems using the LLP64 data model (which includes
Windows).

Walking the affected code path is `cmd_hash_object()` >> `hash_fd()` >>
`hash_literally()` >> `hash_object_file_literally()`.

The function `hash_object_file_literally()` is the first with a file
length parameter (via a mem buffer). This commit changes the type of
that parameter to the LLP64 compatible `size_t` type.

There are no other uses of the function. The `strbuf` type is already
`size_t` compatible.

Note: The hash-object test does not yet pass. Subsequent commits will
continue to walk the call tree's lower level 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 Sep 24, 2024
1 parent f02954c commit 7eff60f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions object-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1889,7 +1889,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, unsigned long len,
const void *buf, size_t len,
const char *type, struct object_id *oid,
char *hdr, int *hdrlen)
{
Expand Down Expand Up @@ -2357,7 +2357,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
return 0;
}

int write_object_file_literally(const void *buf, unsigned long len,
int write_object_file_literally(const void *buf, size_t len,
const char *type, struct object_id *oid,
unsigned flags)
{
Expand Down
2 changes: 1 addition & 1 deletion object-store-ll.h
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ static inline int write_object_file(const void *buf, unsigned long len,
return write_object_file_flags(buf, len, type, oid, NULL, 0);
}

int write_object_file_literally(const void *buf, unsigned long len,
int write_object_file_literally(const void *buf, size_t len,
const char *type, struct object_id *oid,
unsigned flags);
int stream_loose_object(struct input_stream *in_stream, size_t len,
Expand Down

0 comments on commit 7eff60f

Please sign in to comment.