Skip to content

Commit

Permalink
blame.c: Properly initialize strbuf after calling, textconv_object()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Schuberth authored and Junio C Hamano committed Oct 28, 2011
1 parent 9006471 commit 2564aa4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion builtin/blame.c
Original file line number Diff line number Diff line change
Expand Up @@ -2094,8 +2094,10 @@ 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))
textconv_object(read_from, mode, null_sha1, &buf.buf, &buf_len)) {
buf.alloc = buf_len;
buf.len = buf_len;
}
else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
die_errno("cannot open or read '%s'", read_from);
break;
Expand Down

0 comments on commit 2564aa4

Please sign in to comment.