commit 8e5435a864da30ec0210f36fdff464a72cc5b31a
author Holger Hans Peter Freyther <holger@moiji-mobile.com> Fri May 23 08:37:02 2014 +0200
committer Holger Hans Peter Freyther <holger@moiji-mobile.com> Fri May 23 08:37:02 2014 +0200
tree 386040df20ca5e695699f853d759e884564d0d17
parent 550b06c04c5c1b1afafc53ee1274444a09ca4122

timer: Use the now parameter when it is not NULL

The code would have used an uninitialized current_time in case
"now" was not NULL. As now is const and timersub expects a non
const parameter I decided to copy now into current_time.

Fixes: CID #1040661

src/timer.c

diff --git a/src/timer.c b/src/timer.c
index 5988aef..c8376c8 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -141,10 +141,10 @@
 {
 	struct timeval current_time;
 
-	if (!now) {
+	if (!now)
 		gettimeofday(&current_time, NULL);
-		now = &current_time;
-	}
+	else
+		current_time = *now;
 
 	timersub(&timer->timeout, &current_time, remaining);