]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/pack-objects-delta-size-t' into seen
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:44:35 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:44:36 +0000 (10:44 -0700)
The 'pack-objects' and delta-encoding code paths have been updated to
use 'size_t' instead of 'unsigned long' for object sizes and offset
limits, avoiding potential truncation issues on 64-bit Windows.

* js/pack-objects-delta-size-t:
  git-zlib: widen `git_deflate_bound()` to `size_t`
  t/helper/test-pack-deltas: widen `do_compress()`'s maxsize local to `size_t`
  http-push: widen `start_put()`'s size local from `ssize_t` to `size_t`
  diff: widen `deflate_it()`'s bound local from int to `size_t`
  archive-zip: widen `zlib_deflate_raw()`'s maxsize local to `size_t`
  packfile, git-zlib: widen `use_pack()` and zstream avail fields to `size_t`
  delta: widen `create_delta()` and `diff_delta()` to `size_t`
  pack-objects: widen `mem_usage` and `try_delta()`'s out-param to `size_t`
  pack-objects: widen `free_unpacked()` return to `size_t`
  pack-objects: widen delta-cache accounting to `size_t`
  delta: widen `create_delta_index()` parameter to `size_t`
  diff-delta: widen `struct delta_index`' size fields to `size_t`

1  2 
builtin/fast-import.c
builtin/pack-objects.c
diff.c
http-push.c
pack-check.c
packfile.c
packfile.h

Simple merge
Simple merge
diff --cc diff.c
Simple merge
diff --cc http-push.c
Simple merge
diff --cc pack-check.c
index c3b8db7c5c41a66fa09c945bc6d3b7bbd73ac5c3,befb860472f418b92e63659802fa47ad53348349..b18afcce26f95d99fee731fc67f25dd92b0bfeb1
@@@ -69,9 -69,9 +69,9 @@@ static int verify_packfile(struct repos
        if (!is_pack_valid(p))
                return error("packfile %s cannot be accessed", p->pack_name);
  
 -      r->hash_algo->init_fn(&ctx);
 +      git_hash_init(&ctx, r->hash_algo);
        do {
-               unsigned long remaining;
+               size_t remaining;
                unsigned char *in = use_pack(p, w_curs, offset, &remaining);
                offset += remaining;
                if (!pack_sig_ofs)
diff --cc packfile.c
Simple merge
diff --cc packfile.h
Simple merge