Skip to content

Commit 7eff60f

Browse files
PhilipOakleydscho
authored andcommitted
write_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 f02954c commit 7eff60f

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
@@ -1889,7 +1889,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
18891889
}
18901890

18911891
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
1892-
const void *buf, unsigned long len,
1892+
const void *buf, size_t len,
18931893
const char *type, struct object_id *oid,
18941894
char *hdr, int *hdrlen)
18951895
{
@@ -2357,7 +2357,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
23572357
return 0;
23582358
}
23592359

2360-
int write_object_file_literally(const void *buf, unsigned long len,
2360+
int write_object_file_literally(const void *buf, size_t len,
23612361
const char *type, struct object_id *oid,
23622362
unsigned flags)
23632363
{

object-store-ll.h

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

265-
int write_object_file_literally(const void *buf, unsigned long len,
265+
int write_object_file_literally(const void *buf, size_t len,
266266
const char *type, struct object_id *oid,
267267
unsigned flags);
268268
int stream_loose_object(struct input_stream *in_stream, size_t len,

0 commit comments

Comments
 (0)