Changeset 6087 for pjproject

Timestamp:

Oct 4, 2019 7:31:40 AM (5 years ago)

Author:

nanang

Message:

Fixed #2240:

• Avoid double pjsip_inv_dec_ref() by evaluating the local var 'state' instead of 'inv->state' in checking DISCONNECTED state in 'inv_set_state()', as the 'on_state_changed()' callback may recursively call 'inv_set_state()' and shift the state to DISCONNECTED.
• Avoid inv sess destroy in the callback by increasing ref count.

File:

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

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

@@ -314 +314 @@
     inv->cb_called |= (1 << state);
 
-    /* Call on_state_changed() callback. */
+    /* Call on_state_changed() callback.
+     * While in the callback, can the state shift to DISCONNECTED? Perhaps
+     * yes, so better avoid premature destroy of the invite session by
+     * temporarily increase its ref counter.
+     */
+    pjsip_inv_add_ref(inv);
     if (mod_inv.cb.on_state_changed && inv->notify && !dont_notify)
         (*mod_inv.cb.on_state_changed)(inv, e);
+    pjsip_inv_dec_ref(inv);
 
     /* Only decrement when previous state is not already DISCONNECTED */
-    if (inv->state == PJSIP_INV_STATE_DISCONNECTED &&
+    if (state == PJSIP_INV_STATE_DISCONNECTED &&
         prev_state != PJSIP_INV_STATE_DISCONNECTED) 
     {