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

Timestamp:

Jan 29, 2020 4:05:51 AM (4 years ago)

Author:

ming

Message:

Fixed #2264: Potential deadlock between pjsua lock and sip transport's lock

File:

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

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

@@ -398 +398 @@
 }
 
+PJ_DEF(void) pjsip_regc_add_ref( pjsip_regc *regc )
+{
+    pj_assert(regc);
+    pj_atomic_inc(regc->busy_ctr);
+}
+
+PJ_DEF(pj_status_t) pjsip_regc_dec_ref( pjsip_regc *regc )
+{
+    pj_assert(regc);
+    if (pj_atomic_dec_and_get(regc->busy_ctr)==0 && regc->_delete_flag) {
+        pjsip_regc_destroy(regc);
+        return PJ_EGONE;
+    }
+    
+    return PJ_SUCCESS;
+}
+
 PJ_DEF(pj_status_t) pjsip_regc_set_credentials( pjsip_regc *regc,
                                                 int count,
@@ -788 +805 @@
      * in pjsip_regc_send() or in the callback
      */
-    pj_atomic_inc(regc->busy_ctr);
+    pjsip_regc_add_ref(regc);
 
     entry->id = 0;
@@ -804 +821 @@
 
     /* Delete the record if user destroy regc during the callback. */
-    if (pj_atomic_dec_and_get(regc->busy_ctr)==0 && regc->_delete_flag) {
-        pjsip_regc_destroy(regc);
-    }
+    pjsip_regc_dec_ref(regc);
 }
 
@@ -1068 +1083 @@
     pj_bool_t update_contact = PJ_FALSE;
 
-    pj_atomic_inc(regc->busy_ctr);
+    pjsip_regc_add_ref(regc);
     pj_lock_acquire(regc->lock);
 
@@ -1368 +1383 @@
 
     /* Delete the record if user destroy regc during the callback. */
-    if (pj_atomic_dec_and_get(regc->busy_ctr)==0 && regc->_delete_flag) {
-        pjsip_regc_destroy(regc);
-    }
+    pjsip_regc_dec_ref(regc);
 }
 
@@ -1380 +1393 @@
     pj_uint32_t cseq;
 
-    pj_atomic_inc(regc->busy_ctr);
+    pjsip_regc_add_ref(regc);
     pj_lock_acquire(regc->lock);
 
@@ -1481 +1494 @@
 
     /* Delete the record if user destroy regc during the callback. */
-    if (pj_atomic_dec_and_get(regc->busy_ctr)==0 && regc->_delete_flag) {
-        pjsip_regc_destroy(regc);
-    }
+    pjsip_regc_dec_ref(regc);
 
     return status;