From 5eb2682686b32bd82096924eeabd0c5bd347adfd Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 24 Aug 2016 18:37:55 +0200 Subject: [PATCH] common: Guarantee that gnupg_get_time does not return an error. * common/gettime.c (gnupg_get_time): Abor if time() failed. (gnupg_get_isotime): Remove now useless check. (make_timestamp): Remove check becuase we already checked this modulo the faked time thing. -- In reality a call foo = time (NULL) can never fail because the only defined error is EFAULT, but we don't provide a buffer. Signed-off-by: Werner Koch --- common/gettime.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/common/gettime.c b/common/gettime.c index dd9c1968c..9702bbcac 100644 --- a/common/gettime.c +++ b/common/gettime.c @@ -60,6 +60,9 @@ time_t gnupg_get_time () { time_t current = time (NULL); + if (current == (time_t)(-1)) + log_fatal ("time() failed\n"); + if (timemode == NORMAL) return current; else if (timemode == FROZEN) @@ -99,22 +102,16 @@ void gnupg_get_isotime (gnupg_isotime_t timebuf) { time_t atime = gnupg_get_time (); + struct tm *tp; + struct tm tmbuf; - if (atime == (time_t)(-1)) + tp = gnupg_gmtime (&atime, &tmbuf); + if (!tp) *timebuf = 0; else - { - struct tm *tp; - struct tm tmbuf; - - tp = gnupg_gmtime (&atime, &tmbuf); - if (!tp) - *timebuf = 0; - else - snprintf (timebuf, 16, "%04d%02d%02dT%02d%02d%02d", - 1900 + tp->tm_year, tp->tm_mon+1, tp->tm_mday, - tp->tm_hour, tp->tm_min, tp->tm_sec); - } + snprintf (timebuf, 16, "%04d%02d%02dT%02d%02d%02d", + 1900 + tp->tm_year, tp->tm_mon+1, tp->tm_mday, + tp->tm_hour, tp->tm_min, tp->tm_sec); } @@ -164,9 +161,6 @@ u32 make_timestamp (void) { time_t t = gnupg_get_time (); - - if (t == (time_t)-1) - log_fatal ("gnupg_get_time() failed\n"); return (u32)t; }