Changeset 5177 for pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

Timestamp:

Sep 11, 2015 9:40:11 AM (9 years ago)

Author:

nanang

Message:

Re #1885: Fixed race condition in evsub scenario 1 (Subscription timeout vs subscription refresh).

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -628 +628 @@
 
     pjsip_dlg_inc_lock(sub->dlg);
+
+    /* If this timer entry has just been rescheduled or cancelled
+     * while waiting for dialog mutex, just return (see #1885 scenario 1).
+     */
+    if (pj_timer_entry_running(entry) || entry->id == TIMER_TYPE_NONE) {
+        pjsip_dlg_dec_lock(sub->dlg);
+        return;
+    }
 
     timer_id = entry->id;