From a75283d777ed1827ed247dbb465818a0ce371c8f Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 13 Feb 2021 13:54:00 -0500 Subject: cuserid: don't return truncated results checking the length also drops the need to pull in snprintf. --- src/legacy/cuserid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/legacy/cuserid.c b/src/legacy/cuserid.c index fd7832e4..3ff115a1 100644 --- a/src/legacy/cuserid.c +++ b/src/legacy/cuserid.c @@ -2,6 +2,7 @@ #include #include #include +#include char *cuserid(char *buf) { @@ -10,7 +11,10 @@ char *cuserid(char *buf) long pwb[256]; if (getpwuid_r(geteuid(), &pw, (void *)pwb, sizeof pwb, &ppw)) return 0; + size_t len = strnlen(pw.pw_name, L_cuserid); + if (len == L_cuserid) + return 0; if (!buf) buf = usridbuf; - snprintf(buf, L_cuserid, "%s", pw.pw_name); + memcpy(buf, pw.pw_name, len+1); return buf; } -- cgit v1.2.1