Changeset 3301 for pjproject/trunk

Timestamp:

Aug 31, 2010 4:46:13 PM (14 years ago)

Author:

bennylp

Message:

Fixed #1116 (Bug in regenerating elements of some headers when incoming request contains escaped characters (thanks Ferguen Adel for the report)):

• Fixed the printing part of Via "branch" parameter and To/From? "tag" parameter, since these parameters are important for transaction/dialog identification
• Note that if the escaping sequence describes a character that otherwise is a valid token, that token would still be printed unescaped, hence the problem would still persist. But sender really shouldn't send this kind of escaped sequence as it really is asking for trouble.

File:

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

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -27 +27 @@
 #include <pj/pool.h>
 #include <pj/assert.h>
+#include <pjlib-util/string.h>
 
 PJ_DEF_DATA(const pjsip_method) pjsip_invite_method =
@@ -1525 +1526 @@
     buf += printed;
 
-    copy_advance_pair(buf, ";tag=", 5, hdr->tag);
+    copy_advance_pair_escape(buf, ";tag=", 5, hdr->tag,
+                             pc->pjsip_TOKEN_SPEC);
 
     printed = pjsip_param_print_on(&hdr->other_param, buf, endbuf-buf, 
@@ -2050 +2052 @@
 
     copy_advance_pair(buf, ";received=", 10, hdr->recvd_param);
-    copy_advance_pair(buf, ";branch=", 8, hdr->branch_param);
+    copy_advance_pair_escape(buf, ";branch=", 8, hdr->branch_param,
+                             pc->pjsip_TOKEN_SPEC);
     
     printed = pjsip_param_print_on(&hdr->other_param, buf, endbuf-buf,