Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsip/sip_parser.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_parser.c (modified) (3 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsip/sip_parser.c

@@ -328 +328 @@
     status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC_ESC, &pconst.pjsip_TOKEN_SPEC_ESC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-    pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC, ":");
+    pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC_ESC, ":");
 
     status = pj_cis_dup(&pconst.pjsip_HOST_SPEC, &pconst.pjsip_ALNUM_SPEC);
@@ -1150 +1150 @@
                     pvalue->slen -= 2;
                 }
-            } else if (*scanner->curptr == '[') {
+            // } else if (*scanner->curptr == '[') {
                 /* pvalue can be a quoted IPv6; in this case, the
                  * '[' and ']' quote characters are to be removed
-                 * from the pvalue. 
+                 * from the pvalue.
+                 *
+                 * Update: this seems to be unnecessary and may cause
+                 * parsing error for cases such as IPv6 reference with
+                 * port number.
                  */
-                pj_scan_get_char(scanner);
-                pj_scan_get_until_ch(scanner, ']', pvalue);
-                pj_scan_get_char(scanner);
+                // pj_scan_get_char(scanner);
+                // pj_scan_get_until_ch(scanner, ']', pvalue);
+                // pj_scan_get_char(scanner);
             } else if(pj_cis_match(spec, *scanner->curptr)) {
                 parser_get_and_unescape(scanner, pool, spec, esc_spec, pvalue);
@@ -1672 +1676 @@
     hdr->count++;
 
-    while (*scanner->curptr == ',') {
+    while ((hdr->count < PJSIP_GENERIC_ARRAY_MAX_COUNT) &&
+           (*scanner->curptr == ','))
+    {
         pj_scan_get_char(scanner);
         pj_scan_get( scanner, &pconst.pjsip_NOT_COMMA_OR_NEWLINE, 
                      &hdr->values[hdr->count]);
         hdr->count++;
-
-        if (hdr->count >= PJSIP_GENERIC_ARRAY_MAX_COUNT)
-            break;
     }