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

* rf/maint-mailmap-off-by-one: mailmap: avoid out-of-bounds memory access
2012-11-20 10:14:28 -08:00 · 2012-11-20 10:14:28 -08:00 · e87719fc94
parent 35cae74c4d 3174bc5ccf
commit e87719fc94
1 changed files with 1 additions and 1 deletions
--- 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);