Skip to content

Commit 883452b

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 8afb282 commit 883452b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

object-file.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
18111811
}
18121812

18131813
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
1814-
const void *buf, unsigned long len,
1814+
const void *buf, size_t len,
18151815
const char *type, struct object_id *oid,
18161816
char *hdr, int *hdrlen)
18171817
{
@@ -2241,7 +2241,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
22412241
return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
22422242
}
22432243

2244-
int write_object_file_literally(const void *buf, unsigned long len,
2244+
int write_object_file_literally(const void *buf, size_t len,
22452245
const char *type, struct object_id *oid,
22462246
unsigned flags)
22472247
{

object-store.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ static inline int write_object_file(const void *buf, unsigned long len,
272272
return write_object_file_flags(buf, len, type, oid, 0);
273273
}
274274

275-
int write_object_file_literally(const void *buf, unsigned long len,
275+
int write_object_file_literally(const void *buf, size_t len,
276276
const char *type, struct object_id *oid,
277277
unsigned flags);
278278
int stream_loose_object(struct input_stream *in_stream, size_t len,

0 commit comments

Comments
 (0)