From: Rafael Gieschke <rafael@gieschke.de>
Date: Mon, 16 May 2011 20:08:21 +0000 (+0200)
Subject: copy_gecos: fix not adding nlen to len when processing "&"
X-Git-Tag: v1.7.5.3~10^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c0336ff27a9a4bf9db87d65c5dec1ebf7dd9f8c6;p=git.git

copy_gecos: fix not adding nlen to len when processing "&"

nlen has to be added to len when inserting (capitalized) pw_name as
substitution for "&" in pw_gecos. Otherwise, pw_gecos will be truncated
and data might be written beyond name+sz.

Signed-off-by: Rafael Gieschke <rafael@gieschke.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/ident.c b/ident.c
index 9e2438826..423208420 100644
--- a/ident.c
+++ b/ident.c
@@ -34,6 +34,7 @@ static void copy_gecos(const struct passwd *w, char *name, size_t sz)
 			*dst++ = toupper(*w->pw_name);
 			memcpy(dst, w->pw_name + 1, nlen - 1);
 			dst += nlen - 1;
+			len += nlen;
 		}
 	}
 	if (len < sz)