From: Junio C Hamano Date: Mon, 12 Feb 2024 16:40:31 GMT Subject: Re: [PATCH 1/2] receive-pack: use find_commit_header() in check_cert_push_options() Message-ID: In-Reply-To: <7b0a87f1-4693-480e-90d4-14675e9a5f01@web.de> René Scharfe writes: > I just discovered 14570dc67d (wrapper: add function to compare strings > with different NUL termination, 2020-05-25). Perhaps squash this in to > simplify? Oooh, xstrncmpz() seems to target this exact use case. Nice. > > --- > builtin/receive-pack.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c > index dbee508775..db65607485 100644 > --- a/builtin/receive-pack.c > +++ b/builtin/receive-pack.c > @@ -717,9 +717,8 @@ static int check_cert_push_options(const struct string_list *push_options) > buf = option + optionlen + 1; > options_seen++; > if (options_seen > push_options->nr > - || strncmp(push_options->items[options_seen - 1].string, > - option, optionlen) > - || push_options->items[options_seen - 1].string[optionlen]) > + || xstrncmpz(push_options->items[options_seen - 1].string, > + option, optionlen)) > return 0; > } > > -- > 2.43.0