Changeset 1228 for pjproject/trunk

Timestamp:

Apr 29, 2007 6:07:53 PM (18 years ago)

Author:

bennylp

Message:

Continuing ticket #240: Error parsing quoted URI parameters

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_parser.c (modified) (4 diffs)
• test-pjsip/msg_test.c (modified) (4 diffs)

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

@@ -144 +144 @@
                                          pj_pool_t *pool,
                                          pj_str_t *pname, 
-                                         pj_str_t *pvalue);
+                                         pj_str_t *pvalue,
+                                         unsigned option);
 static void         int_parse_hparam( pj_scanner *scanner,
                                       pj_pool_t *pool,
@@ -1131 +1132 @@
 /* Parse parameter (";" pname ["=" pvalue]) in URI. */
 static void int_parse_uri_param( pj_scanner *scanner, pj_pool_t *pool,
-                                 pj_str_t *pname, pj_str_t *pvalue)
+                                 pj_str_t *pname, pj_str_t *pvalue,
+                                 unsigned option)
 {
     /* Get ';' character */
@@ -1138 +1140 @@
     /* Get pname and optionally pvalue */
     pjsip_parse_uri_param_imp(scanner, pool, pname, pvalue, 
-                              PJSIP_PARSE_REMOVE_QUOTE);
+                              option);
 }
 
@@ -1357 +1359 @@
         pj_str_t pname, pvalue;
 
-        int_parse_uri_param( scanner, pool, &pname, &pvalue);
+        int_parse_uri_param( scanner, pool, &pname, &pvalue, 0);
 
         if (!parser_stricmp(pname, pjsip_USER_STR) && pvalue.slen) {

pjproject/trunk/pjsip/src/test-pjsip/msg_test.c

@@ -803 +803 @@
 #define PARAM_CHAR           "[]/:&+$"
 #define SIMPLE_ADDR_SPEC     "sip:host"
-#define ADDR_SPEC            SIMPLE_ADDR_SPEC ";" PARAM_CHAR "=" PARAM_CHAR
+#define ADDR_SPEC            SIMPLE_ADDR_SPEC ";"PARAM_CHAR"="PARAM_CHAR ";p1=\";\""
 #define NAME_ADDR            "<" ADDR_SPEC ">"
 
@@ -1114 +1114 @@
 #define PARAM_CHAR          "[]/:&+$"
 #define SIMPLE_ADDR_SPEC    "sip:host"
-#define ADDR_SPEC           SIMPLE_ADDR_SPEC ";" PARAM_CHAR "=" PARAM_CHAR
+#define ADDR_SPEC            SIMPLE_ADDR_SPEC ";"PARAM_CHAR"="PARAM_CHAR ";p1=\";\""
 #define NAME_ADDR           "<" ADDR_SPEC ">"
  */
@@ -1130 +1130 @@
         return rc;
 
-    if (pj_list_size(&sip_uri->other_param) != 1)
+    if (pj_list_size(&sip_uri->other_param) != 2)
         return -940;
 
@@ -1139 +1139 @@
 
     if (pj_strcmp2(&param->value, PARAM_CHAR))
+        return -943;
+
+    param = param->next;
+    if (pj_strcmp2(&param->name, "p1"))
+        return -942;
+    if (pj_strcmp2(&param->value, "\";\""))
         return -943;