From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Eric Sunshine <sunshine@sunshineco•com>
Cc: Karthik Nayak <karthik.188@gmail•com>,
Git List <git@vger•kernel.org>,
Christian Couder <christian.couder@gmail•com>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)
Date: Thu, 03 Sep 2015 17:01:18 +0200 [thread overview]
Message-ID: <vpqwpw7fsxt.fsf@anie.imag.fr> (raw)
In-Reply-To: <CAPig+cRJG7t1M-FyrB84UG4Ar_NBW3J+wFvFeLg599sAEAweHw@mail.gmail.com> (Eric Sunshine's message of "Thu, 3 Sep 2015 10:39:29 -0400")
Eric Sunshine <sunshine@sunshineco•com> writes:
>> @@ -624,6 +633,33 @@ static void find_subpos(const char *buf, unsigned long sz,
>> *nonsiglen = *sig - buf;
>> }
>>
>> +/*
>> + * If 'lines' is greater than 0, append that many lines from the given
>> + * 'buf' of length 'size' to the given strbuf.
>> + */
>> +static void append_lines(struct strbuf *out, const char *buf, unsigned long size, int lines)
>> +{
>> + int i;
>> + const char *sp, *eol;
>> + size_t len;
>> +
>> + if ((sp = strstr(buf, "\n\n")) && (sp <= buf + size))
>> + size += 2;
>
> Aside from the +2 which Matthieu already questioned, this code has a
> much more serious problem. strstr() assumes that 'buf' is
> NUL-terminated, however, the fact that buf's size is also being passed
> to the function, implies that it may not be NUL-terminated.
If Karthik applies my suggestion, then the strstr would go away. I think
the code would be correct even on non-null-terminated strings.
Actually, we're already making the assumption that the buffer for the
whole tag object is null-terminated (and contains no '\0') for
%(contents):
else if (!strcmp(name, "contents"))
v->s = xstrdup(subpos);
(But I agree that even if the assumption is correct, it should be made
explicit if it remains a precondition of append_lines).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-09-03 15:02 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-01 18:26 [PATCH v15 00/13] port builtin/tag.c to use ref-filter APIs Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 01/13] ref-filter: move `struct atom_value` to ref-filter.c Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 02/13] ref-filter: introduce ref_formatting_state and ref_formatting_stack Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 03/13] utf8: add function to align a string into given strbuf Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 04/13] ref-filter: introduce handler function for each atom Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 05/13] ref-filter: implement an `align` atom Karthik Nayak
2015-09-01 21:19 ` Junio C Hamano
2015-09-02 11:51 ` Karthik Nayak
2015-09-02 15:01 ` Junio C Hamano
2015-09-02 15:05 ` Karthik Nayak
2015-09-02 15:45 ` Junio C Hamano
2015-09-02 16:09 ` Karthik Nayak
2015-09-02 17:10 ` Matthieu Moy
2015-09-02 17:28 ` Junio C Hamano
2015-09-03 13:30 ` Karthik Nayak
2015-09-02 15:50 ` Matthieu Moy
2015-09-02 8:41 ` Matthieu Moy
2015-09-02 12:51 ` Karthik Nayak
2015-09-02 8:45 ` Matthieu Moy
2015-09-02 13:12 ` Karthik Nayak
2015-09-02 15:50 ` Matthieu Moy
2015-09-03 14:12 ` Eric Sunshine
2015-09-03 16:01 ` Karthik Nayak
2015-09-03 16:23 ` Junio C Hamano
2015-09-04 18:02 ` Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 06/13] ref-filter: add option to filter out tags, branches and remotes Karthik Nayak
2015-09-01 21:30 ` Junio C Hamano
2015-09-02 1:27 ` Karthik Nayak
2015-09-02 4:15 ` Junio C Hamano
2015-09-02 12:48 ` Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X) Karthik Nayak
2015-09-02 9:07 ` Matthieu Moy
2015-09-02 14:16 ` Karthik Nayak
2015-09-02 16:11 ` Matthieu Moy
2015-09-03 13:34 ` Karthik Nayak
2015-09-03 13:49 ` Karthik Nayak
2015-09-03 14:47 ` Matthieu Moy
2015-09-03 16:05 ` Karthik Nayak
2015-09-03 14:39 ` Eric Sunshine
2015-09-03 14:47 ` Eric Sunshine
2015-09-03 15:05 ` Matthieu Moy
2015-09-03 16:04 ` Karthik Nayak
2015-09-03 16:27 ` Junio C Hamano
2015-09-04 12:35 ` Karthik Nayak
2015-09-03 15:01 ` Matthieu Moy [this message]
2015-09-03 16:03 ` Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 08/13] ref-filter: add support to sort by version Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 09/13] ref-filter: add option to match literal pattern Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 10/13] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 11/13] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-09-02 9:09 ` Matthieu Moy
2015-09-02 15:10 ` Junio C Hamano
2015-09-02 15:40 ` Karthik Nayak
2015-09-02 16:13 ` Matthieu Moy
2015-09-02 16:43 ` Junio C Hamano
2015-09-03 13:32 ` Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 12/13] tag.c: implement '--format' option Karthik Nayak
2015-09-01 18:26 ` [PATCH v15 13/13] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
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=vpqwpw7fsxt.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=karthik.188@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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