Changeset 3328 for pjproject/trunk

Timestamp:

Sep 30, 2010 11:38:20 PM (14 years ago)

Author:

bennylp

Message:

Closed #1121 (Deadlock in transaction code when hanging up calls): fixed the race condition when setting up transaction timeout

File:

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

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

@@ -1593 +1593 @@
     lock_timer(tsx);
 
-    /* Transaction must not have got final response */
-    PJ_ASSERT_ON_FAIL(tsx->status_code < 200,
-                    { unlock_timer(tsx); return PJ_EINVALIDOP; });
+    /* Transaction should normally not have final response, but as
+     * #1121 says there is a (tolerable) window of race condition
+     * where this might happen.
+     */
+    if (tsx->status_code >= 200 && tsx->timeout_timer.id != 0) {
+        /* Timeout is already set */
+        unlock_timer(tsx);
+        return PJ_EEXISTS;
+    }
 
     if (tsx->timeout_timer.id != 0) {