Skip to content

Commit

Permalink
Merge pull request #3533 from PhilipOakley/hashliteral_t
Browse files Browse the repository at this point in the history
Begin `unsigned long`->`size_t` conversion to support large files on Windows
  • Loading branch information
dscho committed Dec 15, 2021
2 parents da054c1 + a87498f commit 784d65b
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 15 deletions.
19 changes: 10 additions & 9 deletions object-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1773,16 +1773,16 @@ void *read_object_with_reference(struct repository *r,
}

static void write_object_file_prepare(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,
char *hdr, int *hdrlen)
char *hdr, size_t *hdrlen)
{
git_hash_ctx c;

/* Generate the header */
*hdrlen = xsnprintf(hdr, *hdrlen, "%s %"PRIuMAX , type, (uintmax_t)len)+1;

/* Sha1.. */
/* Hash (function pointers) computation */
algo->init_fn(&c);
algo->update_fn(&c, hdr, *hdrlen);
algo->update_fn(&c, buf, len);
Expand Down Expand Up @@ -1840,11 +1840,11 @@ static int write_buffer(int fd, const void *buf, size_t len)
}

int hash_object_file(const struct git_hash_algo *algo, const void *buf,
unsigned long len, const char *type,
size_t len, const char *type,
struct object_id *oid)
{
char hdr[MAX_HEADER_LEN];
int hdrlen = sizeof(hdr);
size_t hdrlen = sizeof(hdr);
write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
return 0;
}
Expand Down Expand Up @@ -2010,12 +2010,12 @@ static int freshen_packed_object(const struct object_id *oid)
return 1;
}

int write_object_file_flags(const void *buf, unsigned long len,
int write_object_file_flags(const void *buf, size_t len,
const char *type, struct object_id *oid,
unsigned flags)
{
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
* it out into .git/objects/??/?{38} file.
Expand All @@ -2027,12 +2027,13 @@ int write_object_file_flags(const void *buf, unsigned long len,
return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
}

int hash_object_file_literally(const void *buf, unsigned long len,
int hash_object_file_literally(const void *buf, size_t len,
const char *type, struct object_id *oid,
unsigned flags)
{
char *header;
int hdrlen, status = 0;
size_t hdrlen;
int status = 0;

/* type string, SP, %lu of the length plus NUL must fit this */
hdrlen = strlen(type) + MAX_HEADER_LEN;
Expand Down
6 changes: 3 additions & 3 deletions object-store.h
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,10 @@ static inline void *repo_read_object_file(struct repository *r,
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);

int hash_object_file(const struct git_hash_algo *algo, const void *buf,
unsigned long len, const char *type,
size_t len, const char *type,
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,
const char *type, struct object_id *oid,
unsigned flags);
static inline int write_object_file(const void *buf, unsigned long len,
Expand All @@ -258,7 +258,7 @@ static inline int write_object_file(const void *buf, unsigned long len,
return write_object_file_flags(buf, len, type, oid, 0);
}

int hash_object_file_literally(const void *buf, unsigned long len,
int hash_object_file_literally(const void *buf, size_t len,
const char *type, struct object_id *oid,
unsigned flags);

Expand Down
3 changes: 1 addition & 2 deletions sha1dc_git.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
/*
* Same as SHA1DCUpdate, but adjust types to match git's usual interface.
*/
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, unsigned long len)
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, size_t len)
{
const char *data = vdata;
/* We expect an unsigned long, but sha1dc only takes an int */
while (len > INT_MAX) {
SHA1DCUpdate(ctx, data, INT_MAX);
data += INT_MAX;
Expand Down
2 changes: 1 addition & 1 deletion sha1dc_git.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void git_SHA1DCInit(SHA1_CTX *);
#endif

void git_SHA1DCFinal(unsigned char [20], SHA1_CTX *);
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, unsigned long len);
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, size_t len);

#define platform_SHA_CTX SHA1_CTX
#define platform_SHA1_Init git_SHA1DCInit
Expand Down
39 changes: 39 additions & 0 deletions t/t1007-hash-object.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ test_expect_success 'setup' '
example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
large5GB sha1:0be2be10a4c8764f32c4bf372a98edc731a4b204
large5GB sha256:dc18ca621300c8d3cfa505a275641ebab00de189859e022a975056882d313e64
EOF
'

Expand Down Expand Up @@ -248,4 +251,40 @@ test_expect_success '--literally with extra-long type' '
echo example | git hash-object -t $t --literally --stdin
'

test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
'files over 4GB hash literally' '
test-tool genzeros $((5*1024*1024*1024)) >big &&
test_oid large5GB >expect &&
git hash-object --stdin --literally <big >actual &&
test_cmp expect actual
'

test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
'files over 4GB hash correctly via --stdin' '
{ test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } &&
test_oid large5GB >expect &&
git hash-object --stdin <big >actual &&
test_cmp expect actual
'

test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
'files over 4GB hash correctly' '
{ test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } &&
test_oid large5GB >expect &&
git hash-object -- big >actual &&
test_cmp expect actual
'

# This clean filter does nothing, other than excercising the interface.
# We ensure that cleaning doesn't mangle large files on 64-bit Windows.
test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
'hash filtered files over 4GB correctly' '
{ test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } &&
test_oid large5GB >expect &&
test_config filter.null-filter.clean "cat" &&
echo "big filter=null-filter" >.gitattributes &&
git hash-object -- big >actual &&
test_cmp expect actual
'

test_done

0 comments on commit 784d65b

Please sign in to comment.