From: Jeff King <peff@peff.net>
To: Sebastian Schuberth <sschuberth@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] blame.c: Properly initialize strbuf after calling textconv_object(), again
Date: Mon, 7 Nov 2011 11:49:46 -0500 [thread overview]
Message-ID: <20111107164946.GD27055@sigill.intra.peff.net> (raw)
In-Reply-To: <4EB7FEE6.9000609@gmail.com>
On Mon, Nov 07, 2011 at 04:53:10PM +0100, Sebastian Schuberth wrote:
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -2114,7 +2114,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
> case S_IFREG:
> if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
> textconv_object(read_from, mode, null_sha1, &buf.buf, &buf_len)) {
> - buf.alloc = buf_len;
> + buf.alloc = buf_len + 1;
> buf.len = buf_len;
> }
> else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
Your patch is correct in the sense that this fixes a bug, but it just
seems wrong to be touching the alloc parameter outside of the strbuf
code. It looks like the intent is to do the equivalent of:
strbuf_add(&buf, some_heap_buf, len);
free(some_heap_buf);
but avoid the extra allocation and copy. Should there be a
"strbuf_attach" function to encapsulate this pattern?
-Peff
next prev parent reply other threads:[~2011-11-07 16:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-07 15:53 [PATCH] blame.c: Properly initialize strbuf after calling textconv_object(), again Sebastian Schuberth
2011-11-07 16:47 ` Junio C Hamano
2011-11-07 17:31 ` Sebastian Schuberth
2011-11-07 16:49 ` Jeff King [this message]
2011-11-07 17:33 ` [PATCHv2] " Sebastian Schuberth
2011-11-07 17:41 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111107164946.GD27055@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sschuberth@gmail.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.
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 NNTP newsgroup(s).