ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

utmpdump: do not use atoi() 

Addresses: https://github.com/karelzak/util-linux/issues/1358
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-06-22 16:50:46 +02:00
parent cfc0d463b4
commit 55cbb788f8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
login-utils/utmpdump.c
View File

@ -74,8 +74,16 @@ static time_t strtotime(const char *s_time)
static suseconds_t strtousec(const char *s_time)
{
const char *s = strchr(s_time, ',');
if (s)
return (suseconds_t) atoi(s + 1);
if (s && *++s) {
suseconds_t us;
char *end = NULL;
errno = 0;
us = strtol(s, &end, 10);
if (errno == 0 && end && end > s)
return us;
}
return 0;
}
@ -266,7 +274,7 @@ static int gettok(char *line, char *dest, int size, int eatspace)
static void undump(FILE *in, FILE *out)
{
struct utmpx ut;
char s_addr[INET6_ADDRSTRLEN + 1], s_time[29], *linestart, *line;
char s_addr[INET6_ADDRSTRLEN + 1], s_time[29] = {}, *linestart, *line;
linestart = xmalloc(1024 * sizeof(*linestart));
s_time[28] = 0;