Changeset 4548

Timestamp:

Jun 28, 2013 9:25:17 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1684 (Failed assertion when scheduling timer in the registration client):

• There is a potential race condition in pjsip_regc_set_delay_before_refresh() because it calls schedule_registration() without mutex protection
• Check if the timer is active and cancel it in schedule_registration() as precaution

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -793 +793 @@
         pj_time_val delay = { 0, 0};
 
+        pj_timer_heap_cancel_if_active(pjsip_endpt_get_timer_heap(regc->endpt),
+                                       &regc->timer, 0);
+
         delay.sec = expiration - regc->delay_before_refresh;
         if (regc->expires != PJSIP_REGC_EXPIRATION_NOT_SPECIFIED && 
@@ -838 +841 @@
         return PJ_ETOOBIG;
 
+    pj_lock_acquire(regc->lock);
+
     if (regc->delay_before_refresh != delay)
     {
@@ -851 +856 @@
         }
     }
+
+    pj_lock_release(regc->lock);
 
     return PJ_SUCCESS;