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

lib/timeutils.c: bug fix Segmentation fault 

Use reentrant time functions to avoid sending a NULL pointer to
format_iso_time() (and to be reentrant ;). Followup commits test for
errors and tm_year wrapping (illustrated below).

hwclock --utc --noadjfile --predict --date '67768034678849400 seconds'
Segmentation fault

Patched
hwclock --utc --noadjfile --predict --date '67768034678849400 seconds'
-2147481748-01-00 00:10:46.000000-05:00

Signed-off-by: J William Piggott <elseifthen@gmx.com>
This commit is contained in:
J William Piggott 2017-12-09 14:01:33 -05:00
parent 44d753407d
commit 97772cc329
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/timeutils.c
View File

@ -462,9 +462,9 @@ int strtimeval_iso(struct timeval *tv, int flags, char *buf, size_t bufsz)
struct tm tm;
if (flags & ISO_GMTIME)
tm = *gmtime(&tv->tv_sec);
gmtime_r(&tv->tv_sec, &tm);
else
tm = *localtime(&tv->tv_sec);
localtime_r(&tv->tv_sec, &tm);
return format_iso_time(&tm, tv->tv_usec, flags, buf, bufsz);
}
@ -480,9 +480,9 @@ int strtime_iso(const time_t *t, int flags, char *buf, size_t bufsz)
struct tm tm;
if (flags & ISO_GMTIME)
tm = *gmtime(t);
gmtime_r(t, &tm);
else
tm = *localtime(t);
localtime_r(t, &tm);
return format_iso_time(&tm, 0, flags, buf, bufsz);
}