[PATCH] blame.c: Properly initialize strbuf after calling, textconv_object()
- From
Sebastian Schuberth <sschuberth@gmail.com>
- Date
- Oct 28, 2011, 15:28 UTC
- Message-ID
- <4EAACA1C.6020302@gmail.com>
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> --- builtin/blame.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c index 26a5d42..86c0537 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2113,8 +2113,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;
-- 1.7.7.msysgit.1.4.gcc6bb.dirty