blame.c: Properly initialize strbuf after calling, textconv_object()
For a plain string where only the length is known, strbuf.alloc needs to be initialized to the length. Otherwise strbuf.alloc is 0 and a later call to strbuf_setlen() will fail. This bug surfaced when calling git blame under Windows on a *.doc file. The *.doc file is converted to plain text by antiword via the textconv mechanism. However, the plain text returned by antiword contains DOS line endings instead of Unix line endings which triggered the strbuf_setlen() which previous to this patch failed. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sebastian Schuberth committed
Oct 28, 2011 at 17:28 UTC
2564aa48ce007ad265c0d31a7cb7513239447d2b
1 file changed
+3
-1
builtin/blame.c
+3
-1
@@ -2094,8 +2094,10 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
2094
switch (st.st_mode & S_IFMT) {
2095
case S_IFREG:
2096
if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
2097
- textconv_object(read_from, mode, null_sha1, &buf.buf, &buf_len))
2097
+ textconv_object(read_from, mode, null_sha1, &buf.buf, &buf_len)) {
2098
+ buf.alloc = buf_len;
2099
buf.len = buf_len;
2100
+ }
2101
else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
2102
die_errno("cannot open or read '%s'", read_from);
2103
break;