Skip to content

Commit abce27e

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 a7cad09 commit abce27e

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
@@ -1803,7 +1803,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
18031803
}
18041804

18051805
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
1806-
const void *buf, unsigned long len,
1806+
const void *buf, size_t len,
18071807
const char *type, struct object_id *oid,
18081808
char *hdr, int *hdrlen)
18091809
{
@@ -2226,7 +2226,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
22262226
return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
22272227
}
22282228

2229-
int write_object_file_literally(const void *buf, unsigned long len,
2229+
int write_object_file_literally(const void *buf, size_t len,
22302230
const char *type, struct object_id *oid,
22312231
unsigned flags)
22322232
{

object-store-ll.h

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

262-
int write_object_file_literally(const void *buf, unsigned long len,
262+
int write_object_file_literally(const void *buf, size_t len,
263263
const char *type, struct object_id *oid,
264264
unsigned flags);
265265
int stream_loose_object(struct input_stream *in_stream, size_t len,

0 commit comments

Comments
 (0)