Changeset 2811 for pjproject/branches/1.0/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Jun 25, 2009 1:01:06 PM (15 years ago)

Author:

bennylp

Message:

Ticket #787: Crash when UAC invite or subscribe session initialization fails (thanks Rostislav Molodyko for the report)

• backported changes from #786

File:

• pjproject/branches/1.0/pjsip/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

pjproject/branches/1.0/pjsip/src/pjsua-lib/pjsua_call.c

@@ -449 +449 @@
     }
 
+    /* Increment the dialog's lock otherwise when invite session creation
+     * fails the dialog will be destroyed prematurely.
+     */
+    pjsip_dlg_inc_lock(dlg);
+
     /* Calculate call's secure level */
     call->secure_level = get_secure_level(acc_id, dest_uri);
@@ -539 +544 @@
                      status);
 
-        /* Upon failure to send first request, both dialog and invite 
+        /* Upon failure to send first request, the invite 
          * session would have been cleared.
          */
         inv = NULL;
-        dlg = NULL;
         goto on_error;
     }
@@ -552 +556 @@
         *p_call_id = call_id;
 
+    pjsip_dlg_dec_lock(dlg);
     pj_pool_release(tmp_pool);
     PJSUA_UNLOCK();
@@ -559 +564 @@
 
 on_error:
+    if (dlg) {
+        /* This may destroy the dialog */
+        pjsip_dlg_dec_lock(dlg);
+    }
+
     if (inv != NULL) {
         pjsip_inv_terminate(inv, PJSIP_SC_OK, PJ_FALSE);
-    } else if (dlg) {
-        pjsip_dlg_terminate(dlg);
     }