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

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

1 files changed, 1 insertions, 1 deletions

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);