From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Ivan Lyapunov <dront78@gmail.com>,
Antoine Pelisse <apelisse@gmail.com>
Subject: [PATCH] blame: handle broken commit headers gracefully
Date: Wed, 17 Apr 2013 20:33:54 +0200 [thread overview]
Message-ID: <516EEB12.5050209@lsrfire.ath.cx> (raw)
In-Reply-To: <516EE300.7020200@lsrfire.ath.cx>
split_ident_line() can leave us with the pointers date_begin, date_end,
tz_begin and tz_end all set to NULL. Check them before use and supply
the same fallback values as in the case of a negative return code from
split_ident_line().
The "(unknown)" is not actually shown in the output, though, because it
will be converted to a number (zero) eventually.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
---
Minimal patch, test case missing. It's a bit sad that the old commit
parser of blame handled Ivan's specific corruption (extra "-<>" after
email) gracefully because it used the spaces as cutting points instead
of "<" and ">".
builtin/blame.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index 86100e9..7770781 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1375,10 +1375,15 @@ static void get_ac_line(const char *inbuf, const char *what,
maillen = ident.mail_end - ident.mail_begin;
mailbuf = ident.mail_begin;
- *time = strtoul(ident.date_begin, NULL, 10);
+ if (ident.date_begin && ident.date_end)
+ *time = strtoul(ident.date_begin, NULL, 10);
+ else
+ *time = 0;
- len = ident.tz_end - ident.tz_begin;
- strbuf_add(tz, ident.tz_begin, len);
+ if (ident.tz_begin && ident.tz_end)
+ strbuf_add(tz, ident.tz_begin, ident.tz_end - ident.tz_begin);
+ else
+ strbuf_addstr(tz, "(unknown)");
/*
* Now, convert both name and e-mail using mailmap
--
1.8.2.1
next prev parent reply other threads:[~2013-04-17 18:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-16 16:55 git log - crash and core dump Ivan Lyapunov
2013-04-16 17:29 ` Antoine Pelisse
2013-04-16 18:09 ` René Scharfe
2013-04-16 19:45 ` Junio C Hamano
2013-04-16 21:10 ` René Scharfe
2013-04-16 22:21 ` Junio C Hamano
2013-04-17 2:50 ` Ivan Lyapunov
2013-04-17 5:22 ` Ivan Lyapunov
2013-04-17 8:27 ` John Keeping
2013-04-17 9:14 ` Ivan Lyapunov
2013-04-17 9:43 ` Konstantin Khomoutov
[not found] ` <CANKwXW1heci+D5ZO3aF+dMN9davRawuZuKz0bf2n3iRiMjjgHg@mail.gmail.com>
2013-04-17 10:23 ` Ivan Lyapunov
2013-04-17 5:26 ` Junio C Hamano
2013-04-17 6:39 ` Jeff King
2013-04-17 17:51 ` Junio C Hamano
2013-04-17 17:59 ` René Scharfe
2013-04-17 18:02 ` Jeff King
2013-04-17 19:06 ` René Scharfe
2013-04-17 21:00 ` [PATCH] cat-file: print tags raw for "cat-file -p" Jeff King
2013-04-19 3:03 ` Eric Sunshine
2013-04-17 18:33 ` [PATCH] pretty: handle broken commit headers gracefully René Scharfe
2013-04-17 18:33 ` René Scharfe [this message]
2013-04-17 21:07 ` [PATCH] blame: " Jeff King
2013-04-17 21:22 ` René Scharfe
2013-04-17 21:55 ` Junio C Hamano
2013-04-18 16:56 ` Jeff King
2013-04-16 21:24 ` git log - crash and core dump Antoine Pelisse
2013-04-16 21:34 ` Jeff King
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=516EEB12.5050209@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=apelisse@gmail.com \
--cc=dront78@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.