Changeset 939 for pjproject/trunk/pjsip/src/pjsip/sip_uri.c

Timestamp:

Feb 10, 2007 7:22:25 PM (17 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

File:

• pjproject/trunk/pjsip/src/pjsip/sip_uri.c (modified) (3 diffs)

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;