Changeset 5223

Timestamp:

Dec 30, 2015 4:07:28 AM (9 years ago)

Author:

ming

Message:

Re #1882 (misc): Moved checking of header count earlier when parsing generic array header in sip_parser.

Thanks to Dusan Klinec for the patch.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_parser.c (modified) (1 diff)

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

@@ -1672 +1672 @@
     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;
     }