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

Timestamp:

Jul 1, 2019 7:12:43 AM (5 years ago)

Author:

ming

Message:

Fixed #2209: Insufficient variable storage to contain Expires header field/ parameter

File:

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

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

@@ -500 +500 @@
  */
 static void set_timer( pjsip_evsub *sub, int timer_id,
-                       pj_int32_t seconds)
+                       pj_uint32_t seconds)
 {
     if (sub->timer.id != TIMER_TYPE_NONE) {
@@ -510 +510 @@
     }
 
-    if (timer_id != TIMER_TYPE_NONE && seconds > 0) {
+    if (timer_id != TIMER_TYPE_NONE && seconds != PJSIP_EXPIRES_NOT_SPECIFIED)
+    {
         pj_time_val timeout;
 
@@ -1069 +1070 @@
 PJ_DEF(pj_status_t) pjsip_evsub_initiate( pjsip_evsub *sub,
                                           const pjsip_method *method,
-                                          pj_int32_t expires,
+                                          pj_uint32_t expires,
                                           pjsip_tx_data **p_tdata)
 {
@@ -1097 +1098 @@
 
     /* Update and add expires header: */
-    if (expires >= 0)
+    if (expires != PJSIP_EXPIRES_NOT_SPECIFIED)
         sub->expires->ivalue = expires;
     pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*)
@@ -1997 +1998 @@
          */
         if (sub->expires->ivalue != 0 &&
-            sub_state->expires_param >= 0 &&
+            sub_state->expires_param != PJSIP_EXPIRES_NOT_SPECIFIED &&
             (pj_stricmp(&sub_state->sub_state, &STR_ACTIVE)==0 ||
              pj_stricmp(&sub_state->sub_state, &STR_PENDING)==0))
         {
-            int next_refresh = sub_state->expires_param;
+            unsigned next_refresh = sub_state->expires_param;
             unsigned timeout;
 
@@ -2100 +2101 @@
             evpkg = find_pkg(&event_hdr->event_type);
             if (evpkg) {
-                if (expires->ivalue < (pj_int32_t)evpkg->pkg_expires)
+                if (expires->ivalue < evpkg->pkg_expires)
                     sub->expires->ivalue = expires->ivalue;
                 else