From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 20 Jul 2019 10:11:01 +0000 (+0100)
Subject: last: replace strncat() with more robust mem2strcpy()
X-Git-Tag: v2.35-rc1~300
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0675f52ab5014b8c0ef5c1a2763b8526e8b03eaa;p=thirdparty%2Futil-linux.git

last: replace strncat() with more robust mem2strcpy()

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/login-utils/last.c b/login-utils/last.c
index 2f7d9d48f5..1b1a741918 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -394,8 +394,7 @@ static int list(const struct last_control *ctl, struct utmpx *p, time_t logout_t
 	/*
 	 *	uucp and ftp have special-type entries
 	 */
-	utline[0] = 0;
-	strncat(utline, p->ut_line, sizeof(utline) - 1);
+	mem2strcpy(utline, p->ut_line, sizeof(p->ut_line), sizeof(utline));
 	if (strncmp(utline, "ftp", 3) == 0 && isdigit(utline[3]))
 		utline[3] = 0;
 	if (strncmp(utline, "uucp", 4) == 0 && isdigit(utline[4]))