Changeset 4163 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Jun 11, 2012 5:15:59 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1533: Deadlock in processing media transport asynchronous creation completion (thank you Itay Bianco for the report)

File:

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

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

@@ -516 +516 @@
 {
     pjsua_call_media *call_med = (pjsua_call_media*)user_data;
-
-    PJSUA_LOCK();
+    pjsua_call *call = NULL;
+    pjsip_dialog *dlg = NULL;
+
+    acquire_call("med_tp_timer_cb", call_med->call->index, &call, &dlg);
 
     call_med->tp_ready = call_med->tp_result;
@@ -524 +526 @@
                                    call_med->call->secure_level, NULL);
 
-    PJSUA_UNLOCK();
+    if (dlg)
+        pjsip_dlg_dec_lock(dlg);
 }
 
@@ -2103 +2106 @@
     unsigned mi;
 
-    PJSUA_LOCK();
     for (mi=0; mi<call->med_cnt; ++mi) {
         pjsua_call_media *call_med = &call->media[mi];
@@ -2112 +2114 @@
              */
             call->async_call.med_ch_deinit = PJ_TRUE;
-            PJSUA_UNLOCK();
             return PJ_SUCCESS;
         }
     }
-    PJSUA_UNLOCK();
 
     PJ_LOG(4,(THIS_FILE, "Call %d: deinitializing media..", call_id));