diff mbox

timer: Use the now parameter when it is not NULL

Message ID 1400827545-23161-1-git-send-email-holger@freyther.de
State Accepted
Headers show

Commit Message

Holger Freyther May 23, 2014, 6:45 a.m. UTC 
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>

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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox

Patch

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 @@  int osmo_timer_remaining(const struct osmo_timer_list *timer,
 {
 	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);