From: Sebastian Schuberth Date: Mon, 7 Nov 2011 17:33:34 +0000 (+0100) Subject: blame.c: Properly initialize strbuf after calling textconv_object(), again X-Git-Tag: v1.7.8-rc1~1^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8518088fe803131d11eade2b15796f26ae207191;p=git.git blame.c: Properly initialize strbuf after calling textconv_object(), again 2564aa4 started to initialize buf.alloc, but that should actually be one more byte than the string length due to the trailing \0. Also, do not modify buf.alloc out of the strbuf code. Use the existing strbuf_attach instead. Signed-off-by: Sebastian Schuberth Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin/blame.c b/builtin/blame.c index e39d9865e..0aac73665 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2077,6 +2077,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, if (!contents_from || strcmp("-", contents_from)) { struct stat st; const char *read_from; + char *buf_ptr; unsigned long buf_len; if (contents_from) { @@ -2094,10 +2095,8 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, switch (st.st_mode & S_IFMT) { 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.len = buf_len; - } + textconv_object(read_from, mode, null_sha1, &buf_ptr, &buf_len)) + strbuf_attach(&buf, buf_ptr, buf_len, buf_len + 1); else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size) die_errno("cannot open or read '%s'", read_from); break;