[MERGED] libosmocore[master]: timer: only call the callback if not NULL

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: timer: only call the callback if not NULL
......................................................................


timer: only call the callback if not NULL

Fix a crash in osmo-sgsn.

Change-Id: I04d58d9580708cc0f6d0f4aa17d3e9f2c6235c8e
---
M src/timer.c
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/timer.c b/src/timer.c
index 10a0b95..cc6d5cc 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -241,7 +241,8 @@
 restart:
 	llist_for_each_entry(this, &timer_eviction_list, list) {
 		osmo_timer_del(this);
-		this->cb(this->data);
+		if (this->cb)
+			this->cb(this->data);
 		work = 1;
 		goto restart;
 	}

-- 
To view, visit https://gerrit.osmocom.org/1344
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I04d58d9580708cc0f6d0f4aa17d3e9f2c6235c8e
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>