Changeset 608 for pjproject/trunk

Timestamp:

Jul 17, 2006 11:24:45 AM (18 years ago)

Author:

bennylp

Message:

Bug fix of previous bug fix

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_parser.h (modified) (1 diff)
• src/pjsip/sip_parser.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_parser.h

@@ -313 +313 @@
     pjsip_ALNUM_SPEC,           /**< Decimal + Alpha. */
     pjsip_TOKEN_SPEC,           /**< Token. */
+    pjsip_TOKEN_SPEC_ESC,       /**< Token without '%' character */
     pjsip_HEX_SPEC,             /**< Hexadecimal digits. */
     pjsip_PARAM_CHAR_SPEC,      /**< For scanning pname (or pvalue when it's 

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -113 +113 @@
             pjsip_ALNUM_SPEC,           /* Decimal + Alpha. */
             pjsip_TOKEN_SPEC,           /* Token. */
+            pjsip_TOKEN_SPEC_ESC,       /* Token without '%' character */
             pjsip_HEX_SPEC,             /* Hexadecimal digits. */
             pjsip_PARAM_CHAR_SPEC,      /* For scanning pname (or pvalue when
@@ -329 +330 @@
     pj_cis_add_str( &pjsip_TOKEN_SPEC, TOKEN);
 
-    /* TOKEN must not have '%' */
-    pj_assert(pj_cis_match(&pjsip_TOKEN_SPEC, '%')==0);
+    status = pj_cis_dup(&pjsip_TOKEN_SPEC_ESC, &pjsip_TOKEN_SPEC);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    pj_cis_del_str(&pjsip_TOKEN_SPEC_ESC, "%");
 
     status = pj_cis_dup(&pjsip_HOST_SPEC, &pjsip_ALNUM_SPEC);
@@ -1084 +1086 @@
 {
     parse_param_imp(scanner, pool, pname, pvalue, &pjsip_TOKEN_SPEC,
-                    &pjsip_TOKEN_SPEC, option);
+                    &pjsip_TOKEN_SPEC_ESC, option);
 }