commit 30a48c61f7fe03a9995e18a46a6eda190f46ccd8
author Benny Prijono <bennylp@teluu.com> Sun Jan 08 23:55:09 2006 +0000
committer Benny Prijono <bennylp@teluu.com> Sun Jan 08 23:55:09 2006 +0000
tree 68656e8906873b5cf03e6df9f4af7c492dfb7c02
parent e8a2ff5dc6d3c36866e4d34053072453443b2957

Timer heap checks if callback is NULL

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@114 74dad513-b988-da41-8d7b-12977e46ad98

pjlib/src/pj/timer.c

diff --git a/pjlib/src/pj/timer.c b/pjlib/src/pj/timer.c
index 212f04a..8eaab79 100644
--- a/pjlib/src/pj/timer.c
+++ b/pjlib/src/pj/timer.c
@@ -444,6 +444,7 @@
     pj_time_val expires;
 
     PJ_ASSERT_RETURN(ht && entry && delay, PJ_EINVAL);
+    PJ_ASSERT_RETURN(entry->cb != NULL, PJ_EINVAL);
 
     pj_gettimeofday(&expires);
     PJ_TIME_VAL_ADD(expires, *delay);
@@ -494,7 +495,8 @@
 	++count;
 
 	unlock_timer_heap(ht);
-	(*node->cb)(ht, node);
+	if (node->cb)
+	    (*node->cb)(ht, node);
 	lock_timer_heap(ht);
     }
     if (ht->cur_size && next_delay) {