Fixed free list corruption with reschedule

1 files changed, 9 insertions, 0 deletions

diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index 48708f8875a..c2087075f4f 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -448,6 +448,15 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *expir
 {
   ACE_TRACE ("ACE_Timer_Heap::reschedule");
 
+  // From James Crawford <jamesc@in.ot.com.au>
+  // If we are rescheduling then we have freed our timer id so we need
+  // to reacquire it.
+  // NOTE: we rely on the fact that we will get the same timer id we just
+  // freed.
+  int timerId = this->timer_id ();
+
+  ACE_ASSERT(timerId == expired->get_timer_id ());   // Just to be safe...
+
   // Restore the heap property.
   this->insert (expired);
 }