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

Re: [PATCH] zlib: properly clamp to uLong

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 18, 2026, 17:03 UTC
Message-ID
<xmqqzf0rrdbp.fsf@gitster.g>
In-Reply-To
<pull.2153.git.1781790619424.gitgitgadget@gmail.com>

The original in js/objects-larger-than-4gb-on-windows says things like:

+ s->z.total_in = (uLong)(s->total_in & ULONG_MAX_VALUE); + s->z.total_out = (uLong)(s->total_out & ULONG_MAX_VALUE);

Your patch ...
Show 13 quoted lines
> +static inline uLong zlib_uLong_cap(size_t s)
> +{
> +	return s < ULONG_MAX_VALUE ? (uLong)s : ULONG_MAX_VALUE;
> +}
> +
>  static void zlib_pre_call(git_zstream *s)
>  {
>  	s->z.next_in = s->next_in;
>  	s->z.next_out = s->next_out;
> -	s->z.total_in = (uLong)(s->total_in & ULONG_MAX_VALUE);
> -	s->z.total_out = (uLong)(s->total_out & ULONG_MAX_VALUE);
> +	s->z.total_in = zlib_uLong_cap(s->total_in);
> +	s->z.total_out = zlib_uLong_cap(s->total_out);
... is an obvious fix for that.
Show 7 quoted lines
> @@ -60,7 +65,7 @@ static void zlib_post_call(git_zstream *s, int status)
>  	 * We track our own totals and verify only the low bits match.
>  	 */
>  	if ((s->z.total_out & ULONG_MAX_VALUE) !=
> -	    ((s->total_out + bytes_produced) & ULONG_MAX_VALUE))
> +	    ((zlib_uLong_cap(s->total_out) + bytes_produced) & ULONG_MAX_VALUE))
>  		BUG("total_out mismatch");

Because we now clamp (not "taking lower bits of") s->total_out to a value between 0..4GB and store it in s->z.total_out in pre-call, let zlib do its thing that increments s->z.total_out modulo 4GB, and we clamp the s->total_out (before incrementing) the same way in post_call here, both sides of "!=" above even out. But the comment before this comparison that claims that "we ... verify only the low bits match" is a bit off the reality, I suspect.

Show 11 quoted lines
> @@ -68,7 +73,7 @@ static void zlib_post_call(git_zstream *s, int status)
>  	 */
>  	if (status != Z_NEED_DICT &&
>  	    (s->z.total_in & ULONG_MAX_VALUE) !=
> -	    ((s->total_in + bytes_consumed) & ULONG_MAX_VALUE))
> +	    ((zlib_uLong_cap(s->total_in) + bytes_consumed) & ULONG_MAX_VALUE))
>  		BUG("total_in mismatch");
>  
>  	s->total_out += bytes_produced;
>
> base-commit: 7a094d68a27e321a99c8ab6b700909e503904bd9
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin
Message 2 of 3 in “zlib: properly clamp to uLong”
  1. zlib: properly clamp to uLongJohannes Schindelin via GitGitGadget, Jun 18, 2026
  2. Junio C HamanoJun 18, 2026
  3. Johannes SchindelinJun 19, 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.