Skip to content

Commit 7d65d13

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 a559944 commit 7d65d13

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
@@ -1964,7 +1964,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
19641964
}
19651965

19661966
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
1967-
const void *buf, unsigned long len,
1967+
const void *buf, size_t len,
19681968
const char *type, struct object_id *oid,
19691969
char *hdr, int *hdrlen)
19701970
{
@@ -2502,7 +2502,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
25022502
return 0;
25032503
}
25042504

2505-
int write_object_file_literally(const void *buf, unsigned long len,
2505+
int write_object_file_literally(const void *buf, size_t len,
25062506
const char *type, struct object_id *oid,
25072507
unsigned flags)
25082508
{

object-store-ll.h

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

280-
int write_object_file_literally(const void *buf, unsigned long len,
280+
int write_object_file_literally(const void *buf, size_t len,
281281
const char *type, struct object_id *oid,
282282
unsigned flags);
283283
int stream_loose_object(struct input_stream *in_stream, size_t len,

0 commit comments

Comments
 (0)