Skip to content

Commit 0f34db2

Browse files
PhilipOakleyGit for Windows Build Agent
authored andcommitted
hash_object_file_literally(): use size_t
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 <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f1c2f5d commit 0f34db2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

object-file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
18101810
}
18111811

18121812
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
1813-
const void *buf, unsigned long len,
1813+
const void *buf, size_t len,
18141814
const char *type, struct object_id *oid,
18151815
char *hdr, int *hdrlen)
18161816
{
@@ -2067,7 +2067,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
20672067
return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
20682068
}
20692069

2070-
int write_object_file_literally(const void *buf, unsigned long len,
2070+
int write_object_file_literally(const void *buf, size_t len,
20712071
const char *type, struct object_id *oid,
20722072
unsigned flags)
20732073
{

object-store.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ static inline int write_object_file(const void *buf, unsigned long len,
266266
return write_object_file_flags(buf, len, type, oid, 0);
267267
}
268268

269-
int write_object_file_literally(const void *buf, unsigned long len,
269+
int write_object_file_literally(const void *buf, size_t len,
270270
const char *type, struct object_id *oid,
271271
unsigned flags);
272272

0 commit comments

Comments
 (0)