From: Romain Francoise <romain@orebokech.com>
Date: Sat, 27 Oct 2012 22:49:55 +0000 (+0200)
Subject: mailmap: avoid out-of-bounds memory access
X-Git-Tag: v1.8.0.1~10^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3174bc5ccfea34717a8dac2175c1951239a4985d;p=git.git

mailmap: avoid out-of-bounds memory access

AddressSanitizer (http://clang.llvm.org/docs/AddressSanitizer.html)
complains of a one-byte buffer underflow in parse_name_and_email() while
running the test suite. And indeed, if one of the lines in the mailmap
begins with '<', we dereference the address just before the beginning of
the buffer when looking for whitespace to remove, before checking that
we aren't going too far.

So reverse the order of the tests to make sure that we don't read
outside the buffer.

Signed-off-by: Romain Francoise <romain@orebokech.com>
Signed-off-by: Jeff King <peff@peff.net>
---

diff --git a/mailmap.c b/mailmap.c
index 47aa41924..ea4b471ed 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -118,7 +118,7 @@ static char *parse_name_and_email(char *buffer, char **name,
 	while (isspace(*nstart) && nstart < left)
 		++nstart;
 	nend = left-1;
-	while (isspace(*nend) && nend > nstart)
+	while (nend > nstart && isspace(*nend))
 		--nend;
 
 	*name = (nstart < nend ? nstart : NULL);