From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com
Subject: [PATCH] blame.c: Properly initialize strbuf after calling, textconv_object()
Date: Fri, 28 Oct 2011 17:28:28 +0200 [thread overview]
Message-ID: <4EAACA1C.6020302@gmail.com> (raw)
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
next reply other threads:[~2011-10-28 15:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-28 15:28 Sebastian Schuberth [this message]
2011-10-28 16:00 ` [PATCH] blame.c: Properly initialize strbuf after calling, textconv_object() Junio C Hamano
2011-10-28 16:32 ` Sebastian Schuberth
2011-10-28 16:44 ` Junio C Hamano
2011-10-28 17:17 ` Sebastian Schuberth
2011-10-28 17:20 ` Junio C Hamano
2011-10-28 18:36 ` Sebastian Schuberth
2011-10-31 17:57 ` Sebastian Schuberth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EAACA1C.6020302@gmail.com \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.org \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).