Changeset 2380 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Dec 17, 2008 2:28:18 PM (15 years ago)

Author:

bennylp

Message:

Ticket 684: protect the memory allocation for TX packet with try/catch, and fixed various transmit data buffer leaks when transmission fails immediately

File:

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

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -541 +541 @@
     if (tsx) {
         pjsip_tsx_terminate(tsx, 500);
+        pj_assert(dlg->tsx_count>0);
         --dlg->tsx_count;
     }
@@ -1412 +1413 @@
     /* Ask transaction to send the response */
     status = pjsip_tsx_send_msg(tsx, tdata);
+
+    /* This function must decrement transmit data request counter 
+     * regardless of the operation status. The transaction only
+     * decrements the counter if the operation is successful.
+     */
+    if (status != PJ_SUCCESS) {
+        pjsip_tx_data_dec_ref(tdata);
+    }
 
     pjsip_dlg_dec_lock(dlg);
@@ -1899 +1908 @@
 
 
-    if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
+    /* It is possible that the transaction is terminated and this function
+     * is called while we're calling on_tsx_state(). So only decrement
+     * the tsx_count if we're still attached to the transaction.
+     */
+    if (tsx->state == PJSIP_TSX_STATE_TERMINATED &&
+        tsx->mod_data[dlg->ua->id] == dlg) 
+    {
+        pj_assert(dlg->tsx_count>0);
         --dlg->tsx_count;
         tsx->mod_data[dlg->ua->id] = NULL;