@matheusbsbs / matheus-bagliano / commits / 58823d4310

hash algorithms: use size_t for section lengths

Continue walking the code path for the >4GB `hash-object --literally` test to the hash algorithm step for LLP64 systems. This patch lets the SHA1DC code use `size_t`, making it compatible with LLP64 data models (as used e.g. by Windows). The interested reader of this patch will note that we adjust the signature of the `git_SHA1DCUpdate()` function without updating _any_ call site. This certainly puzzled at least one reviewer already, so here is an explanation: This function is never called directly, but always via the macro `platform_SHA1_Update`, which is usually called via the macro `git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`, which is defined thusly: static void git_hash_sha1_update(git_hash_ctx *ctx, const void *data, size_t len) { git_SHA1_Update(&ctx->sha1, data, len); } i.e. it contains an implicit downcast from `size_t` to `unsigned long` (before this here patch). With this patch, there is no downcast anymore. With this patch, finally, the t1007-hash-object.sh "files over 4GB hash literally" test case is fixed. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Philip Oakley committed Jun 16, 2026 at 14:49 UTC 58823d431061b82a9cd02a1623aff6fe93a51446

4 files changed +5 -6

object-file.c

+2 -2

@@ -316,7 +316,7 @@ int parse_loose_header(const char *hdr, struct object_info *oi)

316 }

317

318 static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_ctx *c,

319 - const void *buf, unsigned long len,

319 + const void *buf, size_t len,

320 struct object_id *oid,

321 char *hdr, size_t *hdrlen)

322 {

@@ -336,7 +336,7 @@ void write_object_file_prepare(const struct git_hash_algo *algo,

336 /* Generate the header */

337 *hdrlen = format_object_header(hdr, *hdrlen, type, len);

338

339 - /* Sha1.. */

339 + /* Hash (function pointers) computation */

340 hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen);

341 }

342

sha1dc_git.c

+1 -2

@@ -27,10 +27,9 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)

27 /*

28 * Same as SHA1DCUpdate, but adjust types to match git's usual interface.

29 */

30 -void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, unsigned long len)

30 +void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, size_t len)

31 {

32 const char *data = vdata;

33 - /* We expect an unsigned long, but sha1dc only takes an int */

33 while (len > INT_MAX) {

34 SHA1DCUpdate(ctx, data, INT_MAX);

35 data += INT_MAX;

sha1dc_git.h

+1 -1

@@ -15,7 +15,7 @@ void git_SHA1DCInit(SHA1_CTX *);

15 #endif

17 void git_SHA1DCFinal(unsigned char [20], SHA1_CTX *);

18 -void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, unsigned long len);

18 +void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, size_t len);

20 #define platform_SHA_IS_SHA1DC /* used by "test-tool sha1-is-sha1dc" */

t/t1007-hash-object.sh

+1 -1

@@ -261,7 +261,7 @@ test_expect_success '--stdin outside of repository (uses default hash)' '

261 test_cmp expect actual

262 '

263

264 -test_expect_failure EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \

264 +test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \

265 'files over 4GB hash literally' '

266 test-tool genzeros $((5*1024*1024*1024)) >big &&

267 test_oid large5GB >expect &&