From: Patrick Steinhardt Date: Wed, 18 Nov 2026 08:25:09 GMT Subject: Re: [PATCH 1/3] notes-merge: use size_t in write_buf_to_worktree() Message-ID: In-Reply-To: <20261117174353.1158905-6-christian.couder@gmail.com> On Tue, Nov 17, 2026 at 06:43:55PM +0100, Christian Couder wrote: > The write_buf_to_worktree() function in "notes-merge.c" has an > `unsigned long` size argument, while its two callers from that same > file: > > 1. write_note_to_worktree(), and > 2. ll_merge_in_worktree(), > > both pass a `size_t` to that size argument. > > Since c6a4629e32 (odb: use size_t for object_info.sizep and the size > APIs, 2026-06-15), the first caller reads the note into a `size_t` size > before passing it on to write_buf_to_worktree(). On LLP64 platforms > like 64-bit Windows, where `unsigned long` is 32 bits, a delete/modify > conflict on a note of 4 GiB or more therefore silently writes a > truncated note into NOTES_MERGE_WORKTREE. Heh, this feels like nobody would ever hit such an issue. But fixing it is the right thing regardless of that, of course. [snip] > To fix the truncation issue with the first caller and to prepare for > getting rid of the check, let's convert the size argument in > write_buf_to_worktree() to a `size_t`. Makes sense. I've been lamenting about that before, but I really wish that C wasn't so painful to work with in this area. All these implicit casts are just so error-prone. > diff --git a/notes-merge.c b/notes-merge.c > index d361e70a48..4b010bcfc0 100644 > --- a/notes-merge.c > +++ b/notes-merge.c > @@ -310,7 +310,7 @@ static void check_notes_merge_worktree(struct notes_merge_options *o) > } > > static void write_buf_to_worktree(const struct object_id *obj, > - const char *buf, unsigned long size) > + const char *buf, size_t size) > { > int fd; > char *path = repo_git_path(the_repository, NOTES_MERGE_WORKTREE "/%s", oid_to_hex(obj)); Looks obviously correct to me. We pass the value to `write_in_full()`, which already accepts a `size_t` as input parameter. Patrick