Skip to content

Commit ac14ccc

Browse files
PhilipOakleydscho
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 4919442 commit ac14ccc

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
@@ -1788,7 +1788,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
17881788
}
17891789

17901790
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
1791-
const void *buf, unsigned long len,
1791+
const void *buf, size_t len,
17921792
const char *type, struct object_id *oid,
17931793
char *hdr, int *hdrlen)
17941794
{
@@ -2211,7 +2211,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
22112211
return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
22122212
}
22132213

2214-
int write_object_file_literally(const void *buf, unsigned long len,
2214+
int write_object_file_literally(const void *buf, size_t len,
22152215
const char *type, struct object_id *oid,
22162216
unsigned flags)
22172217
{

object-store.h

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

268-
int write_object_file_literally(const void *buf, unsigned long len,
268+
int write_object_file_literally(const void *buf, size_t len,
269269
const char *type, struct object_id *oid,
270270
unsigned flags);
271271
int stream_loose_object(struct input_stream *in_stream, size_t len,

0 commit comments

Comments
 (0)