From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Stefan Beller <sbeller@google.com>,
Git List <git@vger.kernel.org>
Subject: Re: [PATCH 4/6] abbrev_sha1_in_line: don't leak memory
Date: Wed, 30 Mar 2016 13:21:58 -0400 [thread overview]
Message-ID: <20160330172157.GA19675@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqzitfuc7y.fsf@gitster.mtv.corp.google.com>
On Wed, Mar 30, 2016 at 10:06:41AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > On Tue, Mar 29, 2016 at 09:30:38PM -0400, Eric Sunshine wrote:
> >
> >> The implementation of strbuf_list_free() is this:
> >>
> >> struct strbuf **s = sbs;
> >> while (*s) {
> >> strbuf_release(*s);
> >> free(*s++);
> >> }
> >> free(sbs);
> >>
> >> which means that wt-status.c is leaking not only 'split', but also
> >> each element of split[], right?
> >
> > Yeah, I didn't notice that, but I think you're right.
>
> Correct.
>
> I suspect that we would be better off in the longer term if
> we made conscious effort to deprecate and eradicate the use
> of strbuf_split* API functions. They are easy to write
> crappy code with, inefficient, and error prone. You would
> rarely need to have N resulting pieces as strbufs to be
> easily manipulatable [*1*].
Yeah, I agree that it is a clunky interface, and I would be happy to see
it go away. Many callers would be better off with string_list_split().
When I've looked in the past, though, converting some of the callers was
somewhat non-trivial.
But in this case...
> The function can be written by not using the "split and then
> rebuild" pattern, perhaps like so, and the result is even
> easier to read and understand, I would say. A sample rewrite
> is attached at the end.
I agree that the function is much simpler without it.
> + /* find the second token on the line */
> + cp = strchr(line->buf, ' ');
> + if (!cp)
> + return;
> + cp++;
> + ep = strchr(cp, ' ');
> + if (!ep)
> + return;
Would we ever see "cmd sha1" without a third token? If so, we'd want:
ep = strchrnul(cp, ' ');
-Peff
next prev parent reply other threads:[~2016-03-30 17:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 0:38 [PATCH 0/6] Some cleanups Stefan Beller
2016-03-30 0:38 ` [PATCH 1/6] path.c: allocate enough memory for string Stefan Beller
2016-03-30 0:56 ` Junio C Hamano
2016-03-30 0:57 ` Eric Sunshine
2016-03-30 16:41 ` Stefan Beller
2016-03-30 17:16 ` Junio C Hamano
2016-03-30 0:38 ` [PATCH 2/6] imap-send.c, cram: allocate enough memory for null terminated string Stefan Beller
2016-03-30 1:02 ` Eric Sunshine
2016-03-30 1:07 ` Jeff King
2016-03-30 0:38 ` [PATCH 3/6] notes: don't leak memory in git_config_get_notes_strategy Stefan Beller
2016-03-30 1:11 ` Eric Sunshine
2016-03-30 1:13 ` Jeff King
2016-03-30 17:17 ` Junio C Hamano
2016-03-30 0:38 ` [PATCH 4/6] abbrev_sha1_in_line: don't leak memory Stefan Beller
2016-03-30 1:11 ` Jeff King
2016-03-30 1:30 ` Eric Sunshine
2016-03-30 1:31 ` Jeff King
2016-03-30 17:06 ` Junio C Hamano
2016-03-30 17:21 ` Jeff King [this message]
2016-03-30 0:38 ` [PATCH 5/6] bundle: don't leak an fd in case of early return Stefan Beller
2016-03-30 1:17 ` Jeff King
2016-03-30 17:19 ` Junio C Hamano
2016-03-30 0:38 ` [PATCH 6/6] credential-cache, send_request: close fd when done Stefan Beller
2016-03-30 1:20 ` Jeff King
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=20160330172157.GA19675@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.com \
--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).