aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2011-04-21 15:07:36 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-29 11:09:42 -0700
commit9b01f0038b63ccdf697b2387f4fcd4b03bd249d5 (patch)
treee4ccc872f4f1c4320541f49e58d07e1d00a33d85 /builtin
parentec014eac0e9e6f30cbbca616090fa2ecf74797e7 (diff)
downloadgit-9b01f0038b63ccdf697b2387f4fcd4b03bd249d5.tar.gz
git-9b01f0038b63ccdf697b2387f4fcd4b03bd249d5.tar.xz
blame: tolerate bogus e-mail addresses a bit better
The names and e-mails are sanitized by fmt_ident() when creating commits, so that they do not contain "<" nor ">", and the "committer" and "author" lines in the commit object will always be in the form: ("author" | "committer") name SP "<" email ">" SP timestamp SP zone When parsing the email part out, the current code looks for SP starting from the end of the email part, but the author could obfuscate the address as "author at example dot com". We should instead look for SP followed by "<", to match the logic of the side that formats these lines. Signed-off-by: Josh Stone <jistone@redhat.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index f6b03f750..41525f1ea 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1377,7 +1377,7 @@ static void get_ac_line(const char *inbuf, const char *what,
timepos = tmp;
*tmp = 0;
- while (person < tmp && *tmp != ' ')
+ while (person < tmp && !(*tmp == ' ' && tmp[1] == '<'))
tmp--;
if (tmp <= person)
return;