Changeset 4807 for pjproject/trunk

Timestamp:

Mar 31, 2014 10:19:27 AM (11 years ago)

Author:

ming

Message:

Fixed #1756: Race condition in SIP transaction termination (thanks to Kevin Harwell for the patch)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (1 diff)

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

@@ -1611 +1611 @@
     PJ_ASSERT_RETURN(code >= 200, PJ_EINVAL);
 
-    if (tsx->state >= PJSIP_TSX_STATE_TERMINATED)
-        return PJ_SUCCESS;
-
     pj_log_push_indent();
 
     pj_grp_lock_acquire(tsx->grp_lock);
-    tsx_set_status_code(tsx, code, NULL);
-    tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, PJSIP_EVENT_USER, NULL);
+
+    if (tsx->state < PJSIP_TSX_STATE_TERMINATED) {
+        tsx_set_status_code(tsx, code, NULL);
+        tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, PJSIP_EVENT_USER, NULL);
+    }
     pj_grp_lock_release(tsx->grp_lock);