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

Timestamp:

Nov 22, 2005 11:51:50 PM (17 years ago)

Author:

bennylp

Message:

More optimizations for msg parser etc.

File:

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

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

@@ -90 +90 @@
                                          int sep)
 {
-    const pjsip_param *p = param_list->next;
-    char *startbuf = buf;
-    char *endbuf = buf + size;
-
-    while (p != param_list) {
+    const pjsip_param *p;
+    char *startbuf;
+    char *endbuf;
+    int printed;
+
+    p = param_list->next;
+    if (p == param_list)
+        return 0;
+
+    startbuf = buf;
+    endbuf = buf + size;
+
+    do {
         *buf++ = (char)sep;
         copy_advance_escape(buf, p->name, pjsip_PARAM_CHAR_SPEC);
@@ -102 +110 @@
         }
         p = p->next;
-    }
+    } while (p != param_list);
+
     return buf-startbuf;
 }
@@ -249 +258 @@
     //PJ_TODO(SHOULD_DISALLOW_URI_PORT_IN_FROM_TO_HEADER)
     if (url->port && context != PJSIP_URI_IN_FROMTO_HDR) {
+        if (endbuf - buf < 10)
+            return -1;
+
         *buf++ = ':';
         printed = pj_utoa(url->port, buf);
@@ -271 +283 @@
     /* TTL param is not allowed in From, To, Route, and Record-Route header. */
     if (url->ttl_param >= 0 && context != PJSIP_URI_IN_FROMTO_HDR &&
-        context != PJSIP_URI_IN_ROUTING_HDR && (endbuf-buf) > 15) 
+        context != PJSIP_URI_IN_ROUTING_HDR) 
     {
+        if (endbuf - buf < 15)
+            return -1;
         pj_memcpy(buf, ";ttl=", 5);
         printed = pj_utoa(url->ttl_param, buf+5);
@@ -289 +303 @@
     {
         pj_str_t lr = { ";lr", 3 };
+        if (endbuf - buf < 3)
+            return -1;
         copy_advance_check(buf, lr);
     }
@@ -301 +317 @@
     param = url->header_param.next;
     while (param != &url->header_param) {
+        if (endbuf - buf < param->name.slen+2)
+            return -1;
         *buf++ = hparam_char;
         copy_advance_escape(buf, param->name, pjsip_HDR_CHAR_SPEC);