diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2011-10-28 15:28:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-28 15:41:56 (GMT) |
| commit | 2564aa48ce007ad265c0d31a7cb7513239447d2b (patch) | |
| tree | 087f2a1832cebc2aecba80398bb59dce90efa150 | |
| parent | 900647104e02e545064789f3c6b90a5807fba07b (diff) | |
| download | git-2564aa48ce007ad265c0d31a7cb7513239447d2b.zip git-2564aa48ce007ad265c0d31a7cb7513239447d2b.tar.gz git-2564aa48ce007ad265c0d31a7cb7513239447d2b.tar.bz2 | |
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>
| -rw-r--r-- | builtin/blame.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 173f286..e39d986 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -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; |