From: Jeff King <peff@peff.net>
Date: Sun, 4 Nov 2012 13:00:23 +0000 (-0500)
Subject: Merge branch 'rf/maint-mailmap-off-by-one'
X-Git-Tag: v1.8.1-rc0~86
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/016932037455e92e78da5d9b415ab65356f70e8b?hp=9a806be5dfd6d55b04ee2ed3455702b3d174d31c

Merge branch 'rf/maint-mailmap-off-by-one'

* rf/maint-mailmap-off-by-one:
mailmap: avoid out-of-bounds memory access
---

diff --git a/mailmap.c b/mailmap.c
index 47aa419245..ea4b471ede 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);