Changeset 3929

Timestamp:

Dec 28, 2011 9:52:07 AM (12 years ago)

Author:

nanang

Message:

Fix #1433: synchronuous ICE initialization calls PJSUA_UNLOCK() only when the PJSUA lock is actually held by this thread.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -979 +979 @@
     /* Wait until transport is initialized, or time out */
     if (!async) {
-        PJSUA_UNLOCK();
+        pj_bool_t has_pjsua_lock = PJSUA_LOCK_IS_LOCKED();
+        if (has_pjsua_lock)
+            PJSUA_UNLOCK();
         while (call_med->tp_ready == PJ_EPENDING) {
             pjsua_handle_events(100);
         }
-        PJSUA_LOCK();
+        if (has_pjsua_lock)
+            PJSUA_LOCK();
     }