Changeset 939

Timestamp:

Feb 10, 2007 7:22:25 PM (18 years ago)

Author:

bennylp

Message:

Related to ticket #97: make name_addr handling more robust against possibility of bugs that someone may put another name_addr inside a name_addr

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_uri.c (modified) (3 diffs)
• pjsua-lib/pjsua_acc.c (modified) (2 diffs)
• pjsua-lib/pjsua_pres.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_uri.c

@@ -204 +204 @@
 static void *pjsip_name_addr_get_uri( pjsip_name_addr *name )
 {
-    return name->uri;
+    return pjsip_uri_get_uri(name->uri);
 }
 
@@ -530 +530 @@
     char *startbuf = buf;
     char *endbuf = buf + size;
-
-    pj_assert(name->uri != NULL);
+    pjsip_uri *uri;
+
+    uri = pjsip_uri_get_uri(name->uri);
+    pj_assert(uri != NULL);
 
     if (context != PJSIP_URI_IN_REQ_URI) {
@@ -544 +546 @@
     }
 
-    printed = pjsip_uri_print(context,name->uri, buf, size-(buf-startbuf));
+    printed = pjsip_uri_print(context,uri, buf, size-(buf-startbuf));
     if (printed < 1)
         return -1;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -944 +944 @@
      */
     if (!pj_list_empty(&acc->route_set)) {
-        sip_uri = (pjsip_sip_uri*) acc->route_set.next->name_addr.uri;
+        sip_uri = (pjsip_sip_uri*) 
+                  pjsip_uri_get_uri(acc->route_set.next->name_addr.uri);
     } else {
         pj_str_t tmp;
@@ -1035 +1036 @@
     /* If Record-Route is present, then URI is the top Record-Route. */
     if (rdata->msg_info.record_route) {
-        sip_uri = (pjsip_sip_uri*) rdata->msg_info.record_route->name_addr.uri;
+        sip_uri = (pjsip_sip_uri*) 
+                pjsip_uri_get_uri(rdata->msg_info.record_route->name_addr.uri);
     } else {
         pjsip_contact_hdr *h_contact;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

@@ -186 +186 @@
     pjsua_var.buddy[index].uri = tmp;
 
-    sip_uri = (pjsip_sip_uri*) url->uri;
+    sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(url->uri);
     pjsua_var.buddy[index].name = sip_uri->user;
     pjsua_var.buddy[index].display = url->display;