Changeset 5111 for pjproject/trunk

Timestamp:

Jun 19, 2015 2:43:34 PM (9 years ago)

Author:

nanang

Message:

Fixed #1859: Increment tsx group lock counter before send operation and decrement later in tsx's send_msg_callback() to avoid tsx premature destroy.

File:

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

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

@@ -1796 +1796 @@
     {
         *cont = PJ_FALSE;
+
+        /* Decrease pending send counter */
+        pj_grp_lock_dec_ref(tsx->grp_lock);
         return;
     }
 
     pj_grp_lock_acquire(tsx->grp_lock);
+
+    /* Decrease pending send counter */
+    pj_grp_lock_dec_ref(tsx->grp_lock);
 
     /* Reset */
@@ -1933 +1939 @@
             tdata->mod_data[mod_tsx_layer.mod.id] = tsx;
             tsx->pending_tx = tdata;
+
+            /* Increment group lock again for the next sending retry,
+             * to prevent us from being destroyed prematurely (ticket #1859).
+             */
+            pj_grp_lock_add_ref(tsx->grp_lock);
         }
     }
@@ -2123 +2134 @@
     tsx->pending_tx = tdata;
 
+    /* Increment group lock while waiting for send operation to complete,
+     * to prevent us from being destroyed prematurely (ticket #1859).
+     */
+    pj_grp_lock_add_ref(tsx->grp_lock);
+
     /* Begin resolving destination etc to send the message. */
     if (tdata->msg->type == PJSIP_REQUEST_MSG) {
@@ -2132 +2148 @@
             status = PJ_SUCCESS;
         if (status != PJ_SUCCESS) {
+            pj_grp_lock_dec_ref(tsx->grp_lock);
             pjsip_tx_data_dec_ref(tdata);
             tdata->mod_data[mod_tsx_layer.mod.id] = NULL;