git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 07/13] packfile, git-zlib: widen `use_pack()` and zstream avail fields to `size_t`

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Aug 13, 2026, 14:55 UTC
Message-ID
<e4528f9034099bfd13aa189ba6e4a225389da035.1786632952.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.2175.v3.git.1786632952.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

Bundling the two widenings: four call sites pass `&stream.avail_in` directly to `use_pack()`, and widening either type fencepost alone would force a bridge variable at each. Doing both together is the simpler end state and is the prerequisite for the `do_compress()` widening in the next commit, which is what lets `write_no_reuse_object()` lose its last `cast_size_t_to_ulong()` shim.

The unsigned-long locals widened at the other `use_pack()` callers (avail / remaining / left) hold pack-window sizes bounded by `core.packedGitWindowSize`, so the change is type consistency rather than a new >4GB capability. `git_zstream.avail_in`/`avail_out` likewise reach zlib's `uInt` fields only after `zlib_buf_cap()`'s 1 GiB cap, so the wrapper already accepted `size_t`-shaped inputs in practice.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/pack-objects.c | 8 ++++----
 git-zlib.c             | 2 +-
 git-zlib.h             | 4 ++--
 pack-check.c           | 4 ++--
 packfile.c             | 4 ++--
 packfile.h             | 3 ++-
 6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 08c6d294cc..87aa8f44e7 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -488,7 +488,7 @@ static void copy_pack_data(struct hashfile *f,
 		off_t len)
 {
 	unsigned char *in;
-	unsigned long avail;
+	size_t avail;
 
 	while (len) {
 		in = use_pack(p, w_curs, offset, &avail);
@@ -2261,7 +2261,7 @@ static void check_object(struct object_entry *entry, uint32_t object_index)
 		struct object_id base_ref;
 		struct object_entry *base_entry;
 		unsigned long used, used_0;
-		unsigned long avail;
+		size_t avail;
 		off_t ofs;
 		unsigned char *buf, c;
 		enum object_type type;
@@ -2773,8 +2773,8 @@ size_t oe_get_size_slow(struct packing_data *pack,
 	struct pack_window *w_curs;
 	unsigned char *buf;
 	enum object_type type;
-	unsigned long used, avail;
-	size_t size;
+	unsigned long used;
+	size_t avail, size;
 
 	if (e->type_ != OBJ_OFS_DELTA && e->type_ != OBJ_REF_DELTA) {
 		size_t sz;
diff --git a/git-zlib.c b/git-zlib.c
index d21adb3bf5..a3b32d9a86 100644
--- a/git-zlib.c
+++ b/git-zlib.c
@@ -33,7 +33,7 @@ static const char *zerr_to_string(int status)
 
 /* uLong is 32-bit on Windows, even on 64-bit systems */
 #define ULONG_MAX_VALUE maximum_unsigned_value_of_type(uLong)
-static inline uInt zlib_buf_cap(unsigned long len)
+static inline uInt zlib_buf_cap(size_t len)
 {
 	return (ZLIB_BUF_MAX < len) ? ZLIB_BUF_MAX : len;
 }
diff --git a/git-zlib.h b/git-zlib.h
index 44380e8ad3..0b24b15bd0 100644
--- a/git-zlib.h
+++ b/git-zlib.h
@@ -5,8 +5,8 @@
 
 typedef struct git_zstream {
 	struct z_stream_s z;
-	unsigned long avail_in;
-	unsigned long avail_out;
+	size_t avail_in;
+	size_t avail_out;
 	size_t total_in;
 	size_t total_out;
 	unsigned char *next_in;
diff --git a/pack-check.c b/pack-check.c
index 5adfb3f272..befb860472 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -34,7 +34,7 @@ int check_pack_crc(struct packed_git *p, struct pack_window **w_curs,
 	uint32_t data_crc = crc32(0, NULL, 0);
 
 	do {
-		unsigned long avail;
+		size_t avail;
 		void *data = use_pack(p, w_curs, offset, &avail);
 		if (avail > len)
 			avail = len;
@@ -71,7 +71,7 @@ static int verify_packfile(struct repository *r,
 
 	r->hash_algo->init_fn(&ctx);
 	do {
-		unsigned long remaining;
+		size_t remaining;
 		unsigned char *in = use_pack(p, w_curs, offset, &remaining);
 		offset += remaining;
 		if (!pack_sig_ofs)
diff --git a/packfile.c b/packfile.c
index 1d1b23b6cc..629fe46a6a 100644
--- a/packfile.c
+++ b/packfile.c
@@ -620,7 +620,7 @@ static int in_window(struct repository *r, struct pack_window *win,
 unsigned char *use_pack(struct packed_git *p,
 		struct pack_window **w_cursor,
 		off_t offset,
-		unsigned long *left)
+		size_t *left)
 {
 	struct pack_window *win = *w_cursor;
 
@@ -960,7 +960,7 @@ int unpack_object_header(struct packed_git *p,
 			 size_t *sizep)
 {
 	unsigned char *base;
-	unsigned long left;
+	size_t left;
 	unsigned long used;
 	enum object_type type;
 
diff --git a/packfile.h b/packfile.h
index 2329a69701..3cff8bdcb9 100644
--- a/packfile.h
+++ b/packfile.h
@@ -240,7 +240,8 @@ uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
 
 struct object_database;
 
-unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
+unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t,
+			size_t *);
 void close_pack_windows(struct packed_git *);
 void close_pack(struct packed_git *);
 void unuse_pack(struct pack_window **);
-- 
gitgitgadget
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 47 of 55 in “Next size_t stop: pack-objects/delta”
  1. 00/12 Next size_t stop: pack-objects/deltaJohannes Schindelin via GitGitGadget, Jul 9, 2026
  2. 01/12 diff-delta: widen `struct delta_index`' size fields to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  3. Patrick SteinhardtAug 5, 2026
  4. Johannes SchindelinAug 5, 2026
  5. 02/12 delta: widen `create_delta_index()` parameter to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  6. 03/12 pack-objects: widen delta-cache accounting to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  7. Patrick SteinhardtAug 5, 2026
  8. Johannes SchindelinAug 5, 2026
  9. 04/12 pack-objects: widen `free_unpacked()` return to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  10. Patrick SteinhardtAug 5, 2026
  11. 05/12 pack-objects: widen `mem_usage` and `try_delta()`'s out-param to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  12. 06/12 delta: widen `create_delta()` and `diff_delta()` to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  13. Patrick SteinhardtAug 5, 2026
  14. 07/12 packfile, git-zlib: widen `use_pack()` and zstream avail fields to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  15. 08/12 archive-zip: widen `zlib_deflate_raw()`'s maxsize local to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  16. 09/12 diff: widen `deflate_it()`'s bound local from int to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  17. 10/12 http-push: widen `start_put()`'s size local from `ssize_t` to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  18. 11/12 t/helper/test-pack-deltas: widen `do_compress()`'s maxsize local to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  19. 12/12 git-zlib: widen `git_deflate_bound()` to `size_t`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  20. Patrick SteinhardtAug 5, 2026
  21. Johannes SchindelinAug 5, 2026
  22. 00/12 Next size_t stop: pack-objects/deltaJohannes Schindelin via GitGitGadget, Aug 5, 2026
  23. 02/12 delta: widen `create_delta_index()` parameter to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  24. 01/12 diff-delta: widen `struct delta_index`' size fields to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  25. Patrick SteinhardtAug 6, 2026
  26. 03/12 pack-objects: widen delta-cache accounting to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  27. 05/12 pack-objects: widen `mem_usage` and `try_delta()`'s out-param to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  28. 04/12 pack-objects: widen `free_unpacked()` return to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  29. 06/12 delta: widen `create_delta()` and `diff_delta()` to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  30. 07/12 packfile, git-zlib: widen `use_pack()` and zstream avail fields to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  31. Junio C HamanoAug 7, 2026
  32. Junio C HamanoAug 7, 2026
  33. 09/12 diff: widen `deflate_it()`'s bound local from int to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  34. 08/12 archive-zip: widen `zlib_deflate_raw()`'s maxsize local to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  35. 11/12 t/helper/test-pack-deltas: widen `do_compress()`'s maxsize local to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  36. 10/12 http-push: widen `start_put()`'s size local from `ssize_t` to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  37. 12/12 git-zlib: widen `git_deflate_bound()` to `size_t`Johannes Schindelin via GitGitGadget, Aug 5, 2026
  38. Patrick SteinhardtAug 6, 2026
  39. Junio C HamanoAug 6, 2026
  40. Junio C HamanoAug 10, 2026
  41. 00/13 Next size_t stop: pack-objects/deltaJohannes Schindelin via GitGitGadget, Aug 13, 2026
  42. 01/13 diff-delta: widen `struct delta_index`' size fields to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  43. 02/13 delta: widen `create_delta_index()` parameter to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  44. 03/13 pack-objects: widen delta-cache accounting to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  45. 04/13 pack-objects: widen `free_unpacked()` return to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  46. 05/13 pack-objects: widen `mem_usage` and `try_delta()`'s out-param to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  47. 07/13 packfile, git-zlib: widen `use_pack()` and zstream avail fields to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  48. 06/13 delta: widen `create_delta()` and `diff_delta()` to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  49. 08/13 archive-zip: widen `zlib_deflate_raw()`'s maxsize local to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  50. 09/13 diff: widen `deflate_it()`'s bound local from int to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  51. 10/13 http-push: widen `start_put()`'s size local from `ssize_t` to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  52. 12/13 git-zlib: widen `git_deflate_bound()` to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  53. 13/13 packfile: widen `unpack_object_header_buffer()` to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  54. 11/13 t/helper/test-pack-deltas: widen `do_compress()`'s maxsize local to `size_t`Johannes Schindelin via GitGitGadget, Aug 13, 2026
  55. Junio C HamanoAug 13, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.