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

[PATCH v3 13/13] packfile: widen `unpack_object_header_buffer()` to `size_t`

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

As part of the ongoing effort to replace `unsigned long` data types with `size_t` wherever appropriate (mainly to fix all those problems on Windows with objects larger than 4GB), let's also adjust the return type and the type of the `len` parameter of this function.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/pack-objects.c       |  6 ++----
 oss-fuzz/fuzz-pack-headers.c |  2 +-
 packfile.c                   | 10 ++++------
 packfile.h                   |  3 ++-
 4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 87aa8f44e7..d9922174f1 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2260,8 +2260,7 @@ static void check_object(struct object_entry *entry, uint32_t object_index)
 		int have_base = 0;
 		struct object_id base_ref;
 		struct object_entry *base_entry;
-		unsigned long used, used_0;
-		size_t avail;
+		size_t used, used_0, avail;
 		off_t ofs;
 		unsigned char *buf, c;
 		enum object_type type;
@@ -2773,8 +2772,7 @@ 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;
-	size_t avail, size;
+	size_t used, avail, size;
 
 	if (e->type_ != OBJ_OFS_DELTA && e->type_ != OBJ_REF_DELTA) {
 		size_t sz;
diff --git a/oss-fuzz/fuzz-pack-headers.c b/oss-fuzz/fuzz-pack-headers.c
index ef61ab577c..e44afe0b8d 100644
--- a/oss-fuzz/fuzz-pack-headers.c
+++ b/oss-fuzz/fuzz-pack-headers.c
@@ -9,7 +9,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 	size_t len;
 
 	unpack_object_header_buffer((const unsigned char *)data,
-				    (unsigned long)size, &type, &len);
+				    size, &type, &len);
 
 	return 0;
 }
diff --git a/packfile.c b/packfile.c
index 629fe46a6a..faecb3cf17 100644
--- a/packfile.c
+++ b/packfile.c
@@ -866,12 +866,11 @@ struct packfile_list_entry *packfile_store_get_packs(struct odb_source_packed *s
 	return store->packs.head;
 }
 
-unsigned long unpack_object_header_buffer(const unsigned char *buf,
-		unsigned long len, enum object_type *type, size_t *sizep)
+size_t unpack_object_header_buffer(const unsigned char *buf, size_t len,
+				   enum object_type *type, size_t *sizep)
 {
 	unsigned shift;
-	size_t size, c;
-	unsigned long used = 0;
+	size_t size, c, used = 0;
 
 	c = buf[used++];
 	*type = (c >> 4) & 7;
@@ -960,8 +959,7 @@ int unpack_object_header(struct packed_git *p,
 			 size_t *sizep)
 {
 	unsigned char *base;
-	size_t left;
-	unsigned long used;
+	size_t left, used;
 	enum object_type type;
 
 	/* use_pack() assures us we have [base, base + 20) available
diff --git a/packfile.h b/packfile.h
index 3cff8bdcb9..e4e64117fb 100644
--- a/packfile.h
+++ b/packfile.h
@@ -300,7 +300,8 @@ int packfile_fill_entry(struct packed_git *p,
 int is_pack_valid(struct packed_git *);
 void *unpack_entry(struct repository *r, struct packed_git *, off_t,
 		   enum object_type *, size_t *);
-unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, size_t *sizep);
+size_t unpack_object_header_buffer(const unsigned char *buf, size_t len,
+				   enum object_type *type, size_t *sizep);
 size_t get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
 int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, size_t *);
 off_t get_delta_base(struct packed_git *p, struct pack_window **w_curs,
-- 
gitgitgadget
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 53 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.