From 6cbd17470d383616c3b34310ad5716a7c8c8990a Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 22 Nov 2013 12:14:11 -0500 Subject: [PATCH] Handle unlikely negative time in tor_log_err_sigsafe Coverity wants this; CID 1130990. --- src/common/log.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index dffda45c57..9c67de320b 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -474,7 +474,7 @@ tor_log_err_sigsafe(const char *m, ...) { va_list ap; const char *x; - char timebuf[32]; + char timebuf[33]; time_t now = time(NULL); if (!m) @@ -483,8 +483,10 @@ tor_log_err_sigsafe(const char *m, ...) int g = log_time_granularity / 1000; now -= now % g; } - timebuf[0] = '\0'; - format_dec_number_sigsafe(now, timebuf, sizeof(timebuf)); + timebuf[0] = now < 0 ? '-' : ' '; + if (now < 0) now = -now; + timebuf[1] = '\0'; + format_dec_number_sigsafe(now, timebuf+1, sizeof(timebuf)-1); tor_log_err_sigsafe_write("\n==========================================" "================== T="); tor_log_err_sigsafe_write(timebuf);