Changeset 5096 for pjproject/trunk

Timestamp:

May 15, 2015 7:19:28 AM (10 years ago)

Author:

ming

Message:

Fixed #1852: Assertion due to premature destroy of dialog when media channel init fails during incoming call

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1481 +1481 @@
                  * a response message and terminate the invite here.
                  */
+                pjsip_dlg_inc_lock(dlg);
                 pjsip_dlg_respond(dlg, rdata, sip_err_code, NULL, NULL, NULL);
                 if (call->inv && call->inv->dlg) {
                     pjsip_inv_terminate(call->inv, sip_err_code, PJ_FALSE);
                 }
+                pjsip_dlg_dec_lock(dlg);
+
                 call->inv = NULL;
                 call->async_call.dlg = NULL;
@@ -1491 +1494 @@
         } else if (status != PJ_EPENDING) {
             pjsua_perror(THIS_FILE, "Error initializing media channel", status);
+            
+            pjsip_dlg_inc_lock(dlg);
             pjsip_dlg_respond(dlg, rdata, sip_err_code, NULL, NULL, NULL);
             if (call->inv && call->inv->dlg) {
                 pjsip_inv_terminate(call->inv, sip_err_code, PJ_FALSE);
             }
+            pjsip_dlg_dec_lock(dlg);
+
             call->inv = NULL;
             call->async_call.dlg = NULL;