From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: <git@vger.kernel.org>, Eric Sunshine <sunshine@sunshineco.com>,
Denton Liu <liu.denton@gmail.com>, Jeff King <peff@peff.net>
Subject: Re: [PATCH 2/5] gpg-interface: improve interface for parsing tags
Date: Mon, 11 Jan 2021 20:58:57 -0800 [thread overview]
Message-ID: <xmqqbldu699q.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20210111003740.1319996-3-sandals@crustytoothpaste.net> (brian m. carlson's message of "Mon, 11 Jan 2021 00:37:35 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> diff --git a/ref-filter.c b/ref-filter.c
> index aa260bfd09..8d8baec1b5 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -1215,7 +1215,13 @@ static void find_subpos(const char *buf,
> unsigned long *nonsiglen,
> const char **sig, unsigned long *siglen)
> {
> + struct strbuf payload = STRBUF_INIT;
> + struct strbuf signature = STRBUF_INIT;
> const char *eol;
> + const char *end = buf + strlen(buf);
> + const char *sigstart;
> +
> +
> /* skip past header until we hit empty line */
> while (*buf && *buf != '\n') {
> eol = strchrnul(buf, '\n');
> @@ -1228,14 +1234,15 @@ static void find_subpos(const char *buf,
> buf++;
>
> /* parse signature first; we might not even have a subject line */
> - *sig = buf + parse_signature(buf, strlen(buf));
> - *siglen = strlen(*sig);
> + parse_signature(buf, end - buf, &payload, &signature);
> + *sig = strbuf_detach(&signature, siglen);
"unsigned long *siglen" may not be the same as "size_t *siglen", and
the latter is what strbuf_detach() expects to see. This breaks
32-bit builds e.g. [*1*].
I suspect that all these ${foo}len, including the parameter to this
function but also the four local variables in its sole caller, would
want to become size_t.
Thanks.
[Reference]
*1* https://github.com/git/git/runs/1685453231?check_suite_focus=true#step:5:519
next prev parent reply other threads:[~2021-01-12 5:01 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 0:37 [PATCH 0/5] Support for commits signed by multiple algorithms brian m. carlson
2021-01-11 0:37 ` [PATCH 1/5] commit: ignore additional signatures when parsing signed commits brian m. carlson
2021-01-11 0:37 ` [PATCH 2/5] gpg-interface: improve interface for parsing tags brian m. carlson
2021-01-12 4:58 ` Junio C Hamano [this message]
2021-01-14 23:18 ` brian m. carlson
2021-01-15 1:47 ` Junio C Hamano
2021-01-11 0:37 ` [PATCH 3/5] commit: allow parsing arbitrary buffers with headers brian m. carlson
2021-01-11 0:37 ` [PATCH 4/5] ref-filter: hoist signature parsing brian m. carlson
2021-01-11 0:37 ` [PATCH 5/6] fixup! commit: ignore additional signatures when parsing signed commits brian m. carlson
2021-01-11 0:43 ` brian m. carlson
2021-01-11 0:37 ` [PATCH 5/5] gpg-interface: remove other signature headers before verifying brian m. carlson
2021-01-11 0:37 ` [PATCH 6/6] " brian m. carlson
2021-01-11 3:58 ` [PATCH v2 0/5] Support for commits signed by multiple algorithms brian m. carlson
2021-01-11 3:58 ` [PATCH v2 1/5] commit: ignore additional signatures when parsing signed commits brian m. carlson
2021-01-12 17:03 ` SZEDER Gábor
2021-01-11 3:58 ` [PATCH v2 2/5] gpg-interface: improve interface for parsing tags brian m. carlson
2021-01-12 5:24 ` Junio C Hamano
2021-01-11 3:58 ` [PATCH v2 3/5] commit: allow parsing arbitrary buffers with headers brian m. carlson
2021-01-11 3:58 ` [PATCH v2 4/5] ref-filter: hoist signature parsing brian m. carlson
2021-01-11 3:58 ` [PATCH v2 5/5] gpg-interface: remove other signature headers before verifying brian m. carlson
2021-01-11 22:16 ` [PATCH v2 0/5] Support for commits signed by multiple algorithms Junio C Hamano
2021-01-11 23:29 ` brian m. carlson
2021-01-12 2:03 ` Junio C Hamano
2021-01-12 2:24 ` brian m. carlson
2021-01-18 23:49 ` [PATCH v3 0/6] " brian m. carlson
2021-01-18 23:49 ` [PATCH v3 1/6] ref-filter: switch some uses of unsigned long to size_t brian m. carlson
2021-01-18 23:49 ` [PATCH v3 2/6] commit: ignore additional signatures when parsing signed commits brian m. carlson
2021-01-18 23:49 ` [PATCH v3 3/6] gpg-interface: improve interface for parsing tags brian m. carlson
2021-01-18 23:49 ` [PATCH v3 4/6] commit: allow parsing arbitrary buffers with headers brian m. carlson
2021-01-18 23:49 ` [PATCH v3 5/6] ref-filter: hoist signature parsing brian m. carlson
2021-01-18 23:49 ` [PATCH v3 6/6] gpg-interface: remove other signature headers before verifying brian m. carlson
2021-02-11 2:08 ` [PATCH v4 0/6] Support for commits signed by multiple algorithms brian m. carlson
2021-02-11 2:08 ` [PATCH v4 1/6] ref-filter: switch some uses of unsigned long to size_t brian m. carlson
2021-02-11 2:08 ` [PATCH v4 2/6] commit: ignore additional signatures when parsing signed commits brian m. carlson
2021-02-11 2:08 ` [PATCH v4 3/6] gpg-interface: improve interface for parsing tags brian m. carlson
2021-02-11 2:08 ` [PATCH v4 4/6] commit: allow parsing arbitrary buffers with headers brian m. carlson
2021-02-11 2:08 ` [PATCH v4 5/6] ref-filter: hoist signature parsing brian m. carlson
2021-02-11 2:08 ` [PATCH v4 6/6] gpg-interface: remove other signature headers before verifying brian m. carlson
2021-02-11 7:45 ` [PATCH v4 0/6] Support for commits signed by multiple algorithms 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbldu699q.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).