Changeset 5573 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Mar 29, 2017 2:40:48 AM (7 years ago)

Author:

ming

Message:

Fixed #2002: Deadlock between PJSUA LOCK, transaction group lock, and UA mutex

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -642 +642 @@
  * Find a transaction.
  */
-PJ_DEF(pjsip_transaction*) pjsip_tsx_layer_find_tsx( const pj_str_t *key,
-                                                     pj_bool_t lock )
+static pjsip_transaction* find_tsx( const pj_str_t *key, pj_bool_t lock,
+                                    pj_bool_t add_ref )
 {
     pjsip_transaction *tsx;
@@ -655 +655 @@
     /* Prevent the transaction to get deleted before we have chance to lock it.
      */
-    if (tsx && lock)
+    if (tsx)
         pj_grp_lock_add_ref(tsx->grp_lock);
     
@@ -667 +667 @@
     PJ_RACE_ME(5);
 
-    if (tsx && lock) {
-        pj_grp_lock_acquire(tsx->grp_lock);
-        pj_grp_lock_dec_ref(tsx->grp_lock);
+    if (tsx) {
+        if (lock)
+            pj_grp_lock_acquire(tsx->grp_lock);
+
+        if (!add_ref)
+            pj_grp_lock_dec_ref(tsx->grp_lock);
     }
 
     return tsx;
+}
+
+
+PJ_DEF(pjsip_transaction*) pjsip_tsx_layer_find_tsx( const pj_str_t *key,
+                                                     pj_bool_t lock )
+{
+    return find_tsx(key, lock, PJ_FALSE);
+}
+
+
+PJ_DEF(pjsip_transaction*) pjsip_tsx_layer_find_tsx2( const pj_str_t *key,
+                                                      pj_bool_t add_ref )
+{
+    return find_tsx(key, PJ_FALSE, add_ref);
 }