Changeset 4876 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

Timestamp:

Jul 14, 2014 4:49:25 AM (10 years ago)

Author:

nanang

Message:

Misc (re #1751): Fixed possible bad assertion caused by race condition between regc_tsx_callback() and pjsip_regc_send() (thanks John Ryan for the report).

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (1 diff)

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

@@ -1363 +1363 @@
     }
 
-    pj_assert(regc->current_op == REGC_IDLE);
+    /* Just regc->has_tsx check above should be enough. This assertion check
+     * may cause problem, e.g: when regc_tsx_callback() invokes callback,
+     * lock is released and 'has_tsx' is set to FALSE and 'current_op' has
+     * not been updated to REGC_IDLE yet.
+     */
+    //pj_assert(regc->current_op == REGC_IDLE);
 
     /* Invalidate message buffer. */