Changeset 4280 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Oct 8, 2012 5:23:34 AM (12 years ago)

Author:

ming

Message:

Fixed #1591: Fixed dialog locking in acquire_call() when media transport is created asynchronously.

File:

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

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

@@ -1509 +1509 @@
     pj_status_t status = PJ_SUCCESS;
     pj_time_val time_start, timeout;
+    pjsip_dialog *dlg = NULL;
 
     pj_gettimeofday(&time_start);
@@ -1536 +1537 @@
         has_pjsua_lock = PJ_TRUE;
         call = &pjsua_var.calls[call_id];
-
-        if (call->inv == NULL) {
+        if (call->inv)
+            dlg = call->inv->dlg;
+        else
+            dlg = call->async_call.dlg;
+
+        if (dlg == NULL) {
             PJSUA_UNLOCK();
             PJ_LOG(3,(THIS_FILE, "Invalid call_id %d in %s", call_id, title));
@@ -1543 +1548 @@
         }
 
-        status = pjsip_dlg_try_inc_lock(call->inv->dlg);
+        status = pjsip_dlg_try_inc_lock(dlg);
         if (status != PJ_SUCCESS) {
             PJSUA_UNLOCK();
@@ -1568 +1573 @@
     
     *p_call = call;
-    *p_dlg = call->inv->dlg;
+    *p_dlg = dlg;
 
     return PJ_SUCCESS;