Re: [PATCH v2 18/24] gpg-interface: improve interface for parsing tags
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- Feb 26, 2020, 02:23 UTC
- Message-ID
- <20200226022332.GB7911@camp.crustytoothpaste.net>
- In-Reply-To
- <nycvar.QRO.7.76.6.2002251127320.46@tvgsbejvaqbjf.bet>
On 2020-02-25 at 10:29:26, Johannes Schindelin wrote:
Show 34 quoted lines
> Hi brian,
>
> On Sat, 22 Feb 2020, brian m. carlson wrote:
>
> > diff --git a/ref-filter.c b/ref-filter.c
> > index 6867e33648..212f1165bb 100644
> > --- a/ref-filter.c
> > +++ b/ref-filter.c
> > @@ -1161,7 +1161,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');
> > @@ -1174,13 +1180,14 @@ 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);
>
> While I like the spirit of this patch, it makes the Windows build fail. I
> put this on top of Git for Windows' `shears/pu` branch to fix it (maybe
> you could adopt a variation of it?):I'm happy to squash this in. Sorry for the breakage, and thanks for catching this.
-- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204