Changeset 367 for pjproject/trunk

Timestamp:

Mar 30, 2006 4:46:07 PM (19 years ago)

Author:

bennylp

Message:

Fixed crash bug with poll_reset() in rdata

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport.c (modified) (1 diff)
• sip_transport_udp.c (modified) (1 diff)

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

@@ -432 +432 @@
         }
         pj_assert(size != 0);
+        tdata->buf.cur[size] = '\0';
         tdata->buf.cur += size;
-        tdata->buf.cur[size] = '\0';
     }
 

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -174 +174 @@
         }
 
-        /* Reset pool. */
-        pj_pool_reset(rdata->tp_info.pool);
-        init_rdata((struct udp_transport*)rdata->tp_info.transport,
-                   (unsigned)rdata->tp_info.tp_data,
-                   rdata->tp_info.pool,
-                   &rdata);
+        /* Reset pool. 
+         * Need to copy rdata fields to temp variable because they will
+         * be invalid after pj_pool_reset().
+         */
+        {
+            pj_pool_t *rdata_pool = rdata->tp_info.pool;
+            struct udp_transport *rdata_tp ;
+            unsigned rdata_index;
+
+            rdata_tp = (struct udp_transport*)rdata->tp_info.transport;
+            rdata_index = (unsigned)rdata->tp_info.tp_data;
+
+            pj_pool_reset(rdata_pool);
+            init_rdata(rdata_tp, rdata_index, rdata_pool, &rdata);
+
+            /* Change some vars to point to new location after
+             * pool reset.
+             */
+            op_key = &rdata->tp_info.op_key.op_key;
+        }
 
         /* Read next packet. */