Changeset 5352

Timestamp:

Jun 21, 2016 10:19:10 AM (8 years ago)

Author:

nanang

Message:

Fix #1935: Avoid shallow-cloning header in SIP registration client as when sending REGISTER message is done asynchronously via DNS SRV resolution, pjsip_regc may get destroyed prematurely and some data allocated by pjsip_regc pool (e.g: Contact header) will become invalid too before the sending process is completed.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (7 diffs)

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

@@ -522 +522 @@
         while (route != &regc->route_set) {
             pjsip_hdr *new_hdr = (pjsip_hdr*)
-                                 pjsip_hdr_shallow_clone(tdata->pool, route);
+                                 pjsip_hdr_clone(tdata->pool, route);
             pj_list_insert_after(route_pos, new_hdr);
             route_pos = new_hdr;
@@ -536 +536 @@
         while (hdr != &regc->hdr_list) {
             pjsip_hdr *new_hdr = (pjsip_hdr*)
-                                 pjsip_hdr_shallow_clone(tdata->pool, hdr);
+                                 pjsip_hdr_clone(tdata->pool, hdr);
             pjsip_msg_add_hdr(tdata->msg, new_hdr);
             hdr = hdr->next;
@@ -575 +575 @@
     while (hdr != &regc->contact_hdr_list) {
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
-                               pjsip_hdr_shallow_clone(tdata->pool, hdr));
+                               pjsip_hdr_clone(tdata->pool, hdr));
         hdr = hdr->next;
     }
@@ -590 +590 @@
     if (regc->expires_hdr)
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
-                               pjsip_hdr_shallow_clone(tdata->pool,
-                                                       regc->expires_hdr));
+                               pjsip_hdr_clone(tdata->pool,
+                                               regc->expires_hdr));
 
     if (regc->timer.id != 0) {
@@ -602 +602 @@
     if (h_allow) {
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
-                               pjsip_hdr_shallow_clone(tdata->pool, h_allow));
+                               pjsip_hdr_clone(tdata->pool, h_allow));
 
     }
@@ -647 +647 @@
     while ((void*)hdr != (void*)&regc->contact_hdr_list) {
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
-                               pjsip_hdr_shallow_clone(tdata->pool, hdr));
+                               pjsip_hdr_clone(tdata->pool, hdr));
         hdr = hdr->next;
     }
@@ -1172 +1172 @@
             while (chdr != &regc->contact_hdr_list) {
                 pj_list_insert_before(ins_hdr, (pjsip_hdr*)
-                    pjsip_hdr_shallow_clone(tsx->last_tx->pool, chdr));
+                    pjsip_hdr_clone(tsx->last_tx->pool, chdr));
                 chdr = chdr->next;
             }