Changeset 1225 for pjproject/branches/symbian/pjsip/src/pjsip/sip_parser.c

Timestamp:

Apr 29, 2007 1:55:56 PM (17 years ago)

Author:

bennylp

Message:

Related to ticket #239: Error parsing quoted parameters

File:

• pjproject/branches/symbian/pjsip/src/pjsip/sip_parser.c (modified) (10 diffs)

pjproject/branches/symbian/pjsip/src/pjsip/sip_parser.c

@@ -134 +134 @@
                                      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,
@@ -981 +982 @@
 /* Parse parameter (";" pname ["=" pvalue]). */
 static void int_parse_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 */
@@ -988 +990 @@
     /* Get pname and optionally pvalue */
     pjsip_parse_param_imp(scanner, pool, pname, pvalue, 
-                          PJSIP_PARSE_REMOVE_QUOTE);
+                          option);
 }
 
@@ -1199 +1201 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, pool, &pname, &pvalue);
+        int_parse_param( scanner, pool, &pname, &pvalue, 0);
 
         if (!parser_stricmp(pname, pjsip_USER_STR) && pvalue.slen) {
@@ -1355 +1357 @@
                      &hdr->values[hdr->count]);
         hdr->count++;
+
+        if (hdr->count >= PJSIP_GENERIC_ARRAY_MAX_COUNT)
+            break;
     }
     parse_hdr_end(scanner);
@@ -1419 +1424 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, pool, &pname, &pvalue);
+        int_parse_param( scanner, pool, &pname, &pvalue, 0);
         if (!parser_stricmp(pname, pjsip_Q_STR) && pvalue.slen) {
             char *dot_pos = (char *) memchr(pvalue.ptr, '.', pvalue.slen);
@@ -1513 +1518 @@
     while (*scanner->curptr == ';') {
         pj_str_t pname, pvalue;
-        int_parse_param(scanner, ctx->pool, &pname, &pvalue);
+        int_parse_param(scanner, ctx->pool, &pname, &pvalue, 0);
         concat_param(&hdr->media.param, ctx->pool, &pname, &pvalue);
     }
@@ -1566 +1571 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, pool, &pname, &pvalue);
+        int_parse_param( scanner, pool, &pname, &pvalue, 0);
 
         if (!parser_stricmp(pname, pjsip_TAG_STR)) {
@@ -1651 +1656 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, pool, &pname, &pvalue);
+        int_parse_param( scanner, pool, &pname, &pvalue, 0);
 
         if (!parser_stricmp(pname, pjsip_BRANCH_STR) && pvalue.slen) {
@@ -1714 +1719 @@
         pjsip_param *p = (pjsip_param *) 
                          pj_pool_alloc(pool, sizeof(pjsip_param));
-        int_parse_param(scanner, pool, &p->name, &p->value);
+        int_parse_param(scanner, pool, &p->name, &p->value, 0);
         pj_list_insert_before(&hdr->other_param, p);
     }