Changeset 3077 for pjproject

Timestamp:

Jan 27, 2010 9:09:27 AM (15 years ago)

Author:

bennylp

Message:

Fixed ticket #1036: Stray timer may be registered by SIP TCP and TLS transport in destroy routine, which could crash the program on Symbian (thanks Tamàs Solymosi for the report)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (1 diff)
• src/pjsip/sip_transport.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -710 +710 @@
     pj_bool_t               tracing;        /**< Tracing enabled?           */
     pj_bool_t               is_shutdown;    /**< Being shutdown?            */
+    pj_bool_t               is_destroying;  /**< Destroy in progress?       */
 
     /** Key for indexing this transport in hash table. */

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -817 +817 @@
     if (pj_atomic_dec_and_get(tp->ref_cnt) == 0) {
         pj_lock_acquire(tp->tpmgr->lock);
-        /* Verify again. */
-        if (pj_atomic_get(tp->ref_cnt) == 0) {
+        /* Verify again. Do not register timer if the transport is
+         * being destroyed.
+         */
+        if (pj_atomic_get(tp->ref_cnt) == 0 && !tp->is_destroying) {
             pj_time_val delay;
             
@@ -898 +900 @@
     pj_lock_acquire(tp->lock);
     pj_lock_acquire(mgr->lock);
+
+    tp->is_destroying = PJ_TRUE;
 
     /*