path: root/src/timer.c
diff options
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-05-23 08:37:02 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-05-23 08:37:02 +0200
commit8e5435a864da30ec0210f36fdff464a72cc5b31a (patch)
tree386040df20ca5e695699f853d759e884564d0d17 /src/timer.c
parent550b06c04c5c1b1afafc53ee1274444a09ca4122 (diff)
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
Diffstat (limited to 'src/timer.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/src/timer.c b/src/timer.c
index 5988aef9..c8376c8a 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);