From 692106eff933af195c78220fef572c495a45d54d Mon Sep 17 00:00:00 2001 From: marius Date: Thu, 7 Sep 2017 23:28:35 +0000 Subject: [PATCH] MFC: r321293 date: avoid crash on invalid time PR: 220828 Approved by: re (kib) git-svn-id: svn://svn.freebsd.org/base/stable/10@323291 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- bin/date/date.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/date/date.c b/bin/date/date.c index 9ae6502e2..c3919012b 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -85,7 +85,7 @@ main(int argc, char *argv[]) int set_timezone; struct vary *v; const struct vary *badv; - struct tm lt; + struct tm *lt; struct stat sb; v = NULL; @@ -174,8 +174,10 @@ main(int argc, char *argv[]) if (*argv && **argv == '+') format = *argv + 1; - lt = *localtime(&tval); - badv = vary_apply(v, <); + lt = localtime(&tval); + if (lt == NULL) + errx(1, "invalid time"); + badv = vary_apply(v, lt); if (badv) { fprintf(stderr, "%s: Cannot apply date adjustment\n", badv->arg); @@ -191,7 +193,7 @@ main(int argc, char *argv[]) */ setlocale(LC_TIME, "C"); - (void)strftime(buf, sizeof(buf), format, <); + (void)strftime(buf, sizeof(buf), format, lt); (void)printf("%s\n", buf); if (fflush(stdout)) err(1, "stdout"); @@ -210,6 +212,8 @@ setthetime(const char *fmt, const char *p, int jflag, int nflag) int century; lt = localtime(&tval); + if (lt == NULL) + errx(1, "invalid time"); lt->tm_isdst = -1; /* divine correct DST */ if (fmt != NULL) { -- 2.42.0