git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>,
	 Chandra Pratap <chandrapratap376@gmail.com>,
	 Chandra Pratap <chandrapratap3519@gmail.com>,
	 Jeff King <peff@peff.net>,
	 Kyle Lippincott <spectral@google.com>,
	 John Cai <johncai86@gmail.com>
Subject: Re: [PATCH 1/2] receive-pack: use find_commit_header() in check_cert_push_options()
Date: Fri, 09 Feb 2024 14:11:35 -0800	[thread overview]
Message-ID: <xmqqsf21cmp4.fsf@gitster.g> (raw)
In-Reply-To: <ff0db7e3-abce-44ea-a1e3-16e1fdaf4c75@web.de> ("René Scharfe"'s message of "Fri, 9 Feb 2024 21:36:40 +0100")

René Scharfe <l.s.r@web.de> writes:

> The string comparison becomes more complicated because we need to check
> for NUL explicitly after comparing the length-limited option, but on the
> flip side we don't need to clean up allocations or track the remaining
> buffer length.

Yeah, the strncmp() followed by the termination check indeed is
trickier but not having to worry about allocation is nice.

>  		if (options_seen > push_options->nr
> -		    || strcmp(option,
> -			      push_options->items[options_seen - 1].string)) {

We used to allocate option[] with NUL termination, but ...

> -			retval = 0;
> -			goto leave;
> -		}
> -		free(option);
> +		    || strncmp(push_options->items[options_seen - 1].string,
> +			       option, optionlen)
> +		    || push_options->items[options_seen - 1].string[optionlen])

... now option[] is a borrowed memory, option[optionlen] would have
been NUL if we were allocating.  So to see if the last-seen string[]
is different from option[], we have to see that they match up to
optionlen and the last-seen string[] ends there.  Trickier than
before, but is correct.

> +			return 0;
>  	}
>
>  	if (options_seen != push_options->nr)
>  		retval = 0;
>
> -leave:
> -	free(option);
>  	return retval;
>  }
>
> --
> 2.43.0

  parent reply	other threads:[~2024-02-09 22:11 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-09 20:36 [PATCH 1/2] receive-pack: use find_commit_header() in check_cert_push_options() René Scharfe
2024-02-09 20:41 ` [PATCH 2/2] receive-pack: use find_commit_header() in check_nonce() René Scharfe
2024-02-09 22:18   ` Junio C Hamano
2024-06-19 17:13   ` [PATCH 3/2] commit: remove find_header_mem() René Scharfe
2024-06-19 17:31     ` Jeff King
2024-06-20 18:12       ` Junio C Hamano
2024-02-09 22:11 ` Junio C Hamano [this message]
2024-02-10  7:42   ` [PATCH 1/2] receive-pack: use find_commit_header() in check_cert_push_options() René Scharfe
2024-02-12 16:40     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqsf21cmp4.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=chandrapratap3519@gmail.com \
    --cc=chandrapratap376@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johncai86@gmail.com \
    --cc=l.s.r@web.de \
    --cc=peff@peff.net \
    --cc=spectral@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).