Changeset 4855

Timestamp:

Jun 4, 2014 9:23:10 AM (10 years ago)

Author:

bennylp

Message:

Misc (re #1751): invalidate timer entry for every cancel() scenario to avoid assertion next time the entry is scheduled if cancellation fails (thanks Johan Lantz for the report)

File:

• pjproject/trunk/pjlib/src/pj/timer.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/timer.c

@@ -329 +329 @@
 
   // Check to see if the timer_id is out of range
-  if (entry->_timer_id < 0 || (pj_size_t)entry->_timer_id > ht->max_size)
+  if (entry->_timer_id < 0 || (pj_size_t)entry->_timer_id > ht->max_size) {
+    entry->_timer_id = -1;
     return 0;
+  }
 
   timer_node_slot = ht->timer_ids[entry->_timer_id];
 
-  if (timer_node_slot < 0) // Check to see if timer_id is still valid.
+  if (timer_node_slot < 0) { // Check to see if timer_id is still valid.
+    entry->_timer_id = -1;
     return 0;
+  }
 
   if (entry != ht->heap[timer_node_slot])
@@ -341 +345 @@
       if ((flags & F_DONT_ASSERT) == 0)
           pj_assert(entry == ht->heap[timer_node_slot]);
+      entry->_timer_id = -1;
       return 0;
     }