git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-24 05:26:51 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

object-file.c: use size_t for header lengths

Browse Source 
Continue walking the code path for the >4GB `hash-object --literally`
test. The `hash_object_file_literally()` function internally uses both
`hash_object_file()` and `write_object_file_prepare()`. Both function
signatures use `unsigned long` rather than `size_t` for the mem buffer
sizes. Use `size_t` instead, for LLP64 compatibility.

While at it, convert those function's object's header buffer length to
`size_t` for consistency. The value is already upcast to `uintmax_t` for
print format compatibility.

Note: The hash-object test still does not pass. A subsequent commit
continues to walk the call tree's lower level hash functions to identify
further fixes.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Philip Oakley
2021-11-12 21:14:50 +00:00
committed by Johannes Schindelin
parent 54e92593b7
commit 516c82973d
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
object-file.c
View File

@@ -1772,7 +1772,7 @@ void *read_object_with_reference(struct repository *r,
static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c, static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
const void *buf, unsigned long len, const void *buf, unsigned long len,
struct object_id *oid, struct object_id *oid,
char *hdr, int *hdrlen) char *hdr, size_t *hdrlen)
{ {
algo->init_fn(c); algo->init_fn(c);
algo->update_fn(c, hdr, *hdrlen); algo->update_fn(c, hdr, *hdrlen);
@@ -1781,9 +1781,9 @@ static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
} }
static void write_object_file_prepare(const struct git_hash_algo *algo, static void write_object_file_prepare(const struct git_hash_algo *algo,
const void *buf, unsigned long len, const void *buf, size_t len,
enum object_type type, struct object_id *oid, enum object_type type, struct object_id *oid,
char *hdr, int *hdrlen) char *hdr, size_t *hdrlen)
{ {
git_hash_ctx c; git_hash_ctx c;
@@ -1797,7 +1797,7 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
static void write_object_file_prepare_literally(const struct git_hash_algo *algo, static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
const void *buf, size_t len, const void *buf, size_t len,
const char *type, struct object_id *oid, const char *type, struct object_id *oid,
char *hdr, int *hdrlen) char *hdr, size_t *hdrlen)
{ {
git_hash_ctx c; git_hash_ctx c;
@@ -1849,17 +1849,17 @@ out:
} }
static void hash_object_file_literally(const struct git_hash_algo *algo, static void hash_object_file_literally(const struct git_hash_algo *algo,
const void *buf, unsigned long len, const void *buf, size_t len,
const char *type, struct object_id *oid) const char *type, struct object_id *oid)
{ {
char hdr[MAX_HEADER_LEN]; char hdr[MAX_HEADER_LEN];
int hdrlen = sizeof(hdr); size_t hdrlen = sizeof(hdr);
write_object_file_prepare_literally(algo, buf, len, type, oid, hdr, &hdrlen); write_object_file_prepare_literally(algo, buf, len, type, oid, hdr, &hdrlen);
} }
void hash_object_file(const struct git_hash_algo *algo, const void *buf, void hash_object_file(const struct git_hash_algo *algo, const void *buf,
unsigned long len, enum object_type type, size_t len, enum object_type type,
struct object_id *oid) struct object_id *oid)
{ {
hash_object_file_literally(algo, buf, len, type_name(type), oid); hash_object_file_literally(algo, buf, len, type_name(type), oid);
@@ -2201,12 +2201,12 @@ cleanup:
return err; return err;
} }
int write_object_file_flags(const void *buf, unsigned long len, int write_object_file_flags(const void *buf, size_t len,
enum object_type type, struct object_id *oid, enum object_type type, struct object_id *oid,
unsigned flags) unsigned flags)
{ {
char hdr[MAX_HEADER_LEN]; char hdr[MAX_HEADER_LEN];
int hdrlen = sizeof(hdr); size_t hdrlen = sizeof(hdr);
/* Normally if we have it in the pack then we do not bother writing /* Normally if we have it in the pack then we do not bother writing
* it out into .git/objects/??/?{38} file. * it out into .git/objects/??/?{38} file.
@@ -2223,7 +2223,8 @@ int write_object_file_literally(const void *buf, size_t len,
unsigned flags) unsigned flags)
{ {
char *header; char *header;
int hdrlen, status = 0; size_t hdrlen;
int status = 0;
/* type string, SP, %lu of the length plus NUL must fit this */ /* type string, SP, %lu of the length plus NUL must fit this */
hdrlen = strlen(type) + MAX_HEADER_LEN; hdrlen = strlen(type) + MAX_HEADER_LEN;

4
object-store-ll.h
View File

@@ -247,10 +247,10 @@ void *repo_read_object_file(struct repository *r,
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *); int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
void hash_object_file(const struct git_hash_algo *algo, const void *buf, void hash_object_file(const struct git_hash_algo *algo, const void *buf,
unsigned long len, enum object_type type, size_t len, enum object_type type,
struct object_id *oid); struct object_id *oid);
int write_object_file_flags(const void *buf, unsigned long len, int write_object_file_flags(const void *buf, size_t len,
enum object_type type, struct object_id *oid, enum object_type type, struct object_id *oid,
unsigned flags); unsigned flags);
static inline int write_object_file(const void *buf, unsigned long len, static inline int write_object_file(const void *buf, unsigned long len,