Changeset 4969 for pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

Timestamp:

Dec 19, 2014 2:22:35 PM (9 years ago)

Author:

nanang

Message:

Fixed #1807: Crash when shutting down library while having subscription transactions on going.

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -235 +235 @@
     int                   pending_tsx;  /**< Number of pending transactions.*/
     pjsip_transaction    *pending_sub;  /**< Pending UAC SUBSCRIBE tsx.     */
+    pj_timer_entry       *pending_sub_timer; /**< Stop pending sub timer.   */
 
     void                 *mod_data[PJSIP_MAX_MODULE];   /**< Module data.   */
@@ -535 +536 @@
     /* Kill timer */
     set_timer(sub, TIMER_TYPE_NONE, 0);
+
+    /* Kill timer for stopping pending sub (see ticket #1807) */
+    if (sub->pending_sub_timer && sub->pending_sub_timer->id == 1) {
+        pjsip_endpt_cancel_timer(sub->endpt, sub->pending_sub_timer);
+        sub->pending_sub_timer->id = 0;
+        sub->pending_sub_timer = NULL;
+    }
 
     /* Remove this session from dialog's list of subscription */
@@ -1349 +1357 @@
 
     PJ_UNUSED_ARG(timer_heap);
+
+    /* Clear timer ID */
+    entry->id = 0;
 
     key = (pj_str_t*)entry->user_data;
@@ -1571 +1582 @@
             timer->cb = &terminate_timer_cb;
             timer->user_data = key;
+            timer->id = 1;
+            sub->pending_sub_timer = timer;
 
             pjsip_endpt_schedule_timer(dlg->endpt, timer, &timeout);