Changeset 6134 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

Timestamp:

Jan 16, 2020 6:37:40 AM (5 years ago)

Author:

ming

Message:

Fixed #2260: Potential deadlock between sip_transaction and sip_reg

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -1191 +1191 @@
 
         if (status == PJ_SUCCESS) {
+            /* Need to unlock the regc temporarily while sending the message
+             * to prevent deadlock (see ticket #2260 and #1247).
+             * It should be safe to do this since the regc's refcount has been
+             * incremented.
+             */
+            pj_lock_release(regc->lock);
             status = pjsip_regc_send(regc, tdata);
+            pj_lock_acquire(regc->lock);
         }
         
@@ -1281 +1288 @@
         status = pjsip_regc_register(regc, regc->auto_reg, &tdata);
         if (status == PJ_SUCCESS) {
+            /* Need to unlock the regc temporarily while sending the message
+             * to prevent deadlock (see ticket #2260 and #1247).
+             * It should be safe to do this since the regc's refcount has been
+             * incremented.
+             */
+            pj_lock_release(regc->lock);
             status = pjsip_regc_send(regc, tdata);
+            pj_lock_acquire(regc->lock);
         }