Changeset 5576

Timestamp:

Mar 31, 2017 9:52:12 AM (8 years ago)

Author:

riza

Message:

Fix #2007: Fix Possible crash when using session timer due to the early release of dialog pool.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c

@@ -334 +334 @@
     pj_status_t status;
     pj_bool_t as_refresher;
+    int entry_id;
+    char obj_name[PJ_MAX_OBJ_NAME];
 
     pj_assert(inv);
@@ -345 +347 @@
     as_refresher =
         (inv->timer->refresher == TR_UAC && inv->timer->role == PJSIP_ROLE_UAC) ||
-        (inv->timer->refresher == TR_UAS && inv->timer->role == PJSIP_ROLE_UAS);    
+        (inv->timer->refresher == TR_UAS && inv->timer->role == PJSIP_ROLE_UAS);
+
+    entry_id = entry->id;
+    pj_ansi_strncpy(obj_name, inv->pool->obj_name, PJ_MAX_OBJ_NAME);
 
     /* Do action based on role(refresher or refreshee). 
@@ -354 +359 @@
      * - end session if there is no refresh request received.
      */
-    if (as_refresher && (entry->id != REFRESHER_EXPIRE_TIMER_ID)) {
+    if (as_refresher && (entry_id != REFRESHER_EXPIRE_TIMER_ID)) {
         pj_time_val now;
 
@@ -415 +420 @@
 
         pj_gettimeofday(&now);
-        PJ_LOG(4, (inv->pool->obj_name,
+        PJ_LOG(4, (obj_name,
                    "Refreshing session after %ds (expiration period=%ds)",
                    (now.sec-inv->timer->last_refresh.sec),
@@ -433 +438 @@
 
         pj_gettimeofday(&now);
-        PJ_LOG(3, (inv->pool->obj_name, 
+        PJ_LOG(3, (obj_name,
                    "No session %s received after %ds "
                    "(expiration period=%ds), stopping session now!",
@@ -452 +457 @@
     }
 
+    /*
+     * At this point, dialog might have already been destroyed,
+     * including its pool used by the invite session.
+     */
+
     /* Print error message, if any */
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(2, (inv->pool->obj_name, status,
+        PJ_PERROR(2, (obj_name, status,
                      "Error in %s session timer",
-                     ((as_refresher && entry->id != REFRESHER_EXPIRE_TIMER_ID)? 
+                     ((as_refresher && entry_id != REFRESHER_EXPIRE_TIMER_ID)?
                        "refreshing" : "terminating")));
     }