Changeset 1222 for pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip/sip_parser.c

Timestamp:

Apr 29, 2007 6:30:58 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #239: Error parsing/printing quoted parameters, and added header tests

File:

• pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip/sip_parser.c (modified) (10 diffs)

pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip/sip_parser.c

@@ -139 +139 @@
                                      pj_pool_t *pool,
                                      pj_str_t *pname, 
-                                     pj_str_t *pvalue);
+                                     pj_str_t *pvalue,
+                                     unsigned option);
 static void         int_parse_uri_param( pj_scanner *scanner, 
                                          pj_pool_t *pool,
@@ -1118 +1119 @@
 /* Parse parameter (";" pname ["=" pvalue]) in header. */
 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 */
@@ -1124 +1126 @@
 
     /* Get pname and optionally pvalue */
-    pjsip_parse_param_imp(scanner, pool, pname, pvalue, 
-                          PJSIP_PARSE_REMOVE_QUOTE);
+    pjsip_parse_param_imp(scanner, pool, pname, pvalue, option);
 }
 
@@ -1536 +1537 @@
      *   Accept, Allow, Supported
      */
-    if (*scanner->curptr == '\r' || *scanner->curptr == '\n') {
+    if (pj_scan_is_eof(scanner) || 
+        *scanner->curptr == '\r' || *scanner->curptr == '\n') 
+    {
         goto end;
     }
@@ -1548 +1551 @@
                      &hdr->values[hdr->count]);
         hdr->count++;
+
+        if (hdr->count >= PJSIP_GENERIC_ARRAY_MAX_COUNT)
+            break;
     }
 
@@ -1614 +1620 @@
         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 = pj_memchr(pvalue.ptr, '.', pvalue.slen);
@@ -1707 +1713 @@
     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);
     }
@@ -1760 +1766 @@
         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)) {
@@ -1844 +1850 @@
         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) {
@@ -1905 +1911 @@
     while (*scanner->curptr == ';') {
         pjsip_param *p = 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);
     }