Changeset 2985 for pjproject

Timestamp:

Nov 4, 2009 1:17:31 PM (14 years ago)

Author:

bennylp

Message:

Fixed ticket #940: Multiple header rows with the same name may not be completely processed by PJSIP modules

• the parser now collect and aggregate all Supported/Require? header fields into single header

Location:

pjproject/trunk

Files:

• pjsip/include/pjsip/sip_transport.h (modified) (1 diff)
• pjsip/src/pjsip/sip_parser.c (modified) (5 diffs)
• tests/pjsua/scripts-sipp/uac-inv-multiple-require.xml (added)

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -386 +386 @@
         pjsip_clen_hdr          *clen;
 
-        /** The first Require header. */
+        /** "Require" header containing aggregates of all Require
+         *  headers found in the message, or NULL. 
+         */
         pjsip_require_hdr       *require;
+
+        /** "Supported" header containing aggregates of all Supported
+         *  headers found in the message, or NULL. 
+         */
+        pjsip_supported_hdr     *supported;
 
         /** The list of error generated by the parser when parsing 

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

@@ -1008 +1008 @@
                 hdr = (*handler)(ctx);
 
+                /* Note:
+                 *  hdr MAY BE NULL, if parsing does not yield a new header
+                 *  instance, e.g. the values have been added to existing
+                 *  header. See http://trac.pjsip.org/repos/ticket/940
+                 */
+
                 /* Check if we've just parsed a Content-Type header. 
                  * We will check for a message body if we've got Content-Type 
                  * header.
                  */
-                if (hdr->type == PJSIP_H_CONTENT_TYPE) {
+                if (hdr && hdr->type == PJSIP_H_CONTENT_TYPE) {
                     ctype_hdr = (pjsip_ctype_hdr*)hdr;
                 }
@@ -1028 +1034 @@
              * So here we must insert list instead of just insert one header.
              */
-            pj_list_insert_nodes_before(&msg->hdr, hdr);
+            if (hdr)
+                pj_list_insert_nodes_before(&msg->hdr, hdr);
             
             /* Parse until EOF or an empty line is found. */
@@ -1640 +1647 @@
     }
 
-    pj_scan_get( scanner, &pconst.pjsip_NOT_COMMA_OR_NEWLINE, &hdr->values[0]);
+    if (hdr->count >= PJ_ARRAY_SIZE(hdr->values)) {
+        /* Too many elements */
+        on_syntax_error(scanner);
+        return;
+    }
+
+    pj_scan_get( scanner, &pconst.pjsip_NOT_COMMA_OR_NEWLINE, 
+                 &hdr->values[hdr->count]);
     hdr->count++;
 
@@ -1918 +1932 @@
 static pjsip_hdr* parse_hdr_require( pjsip_parse_ctx *ctx )
 {
-    pjsip_require_hdr *hdr = pjsip_require_hdr_create(ctx->pool);
+    pjsip_require_hdr *hdr;
+    pj_bool_t new_hdr = (ctx->rdata->msg_info.require == NULL);
+    
+    if (ctx->rdata && ctx->rdata->msg_info.require) {
+        hdr = ctx->rdata->msg_info.require;
+    } else {
+        hdr = pjsip_require_hdr_create(ctx->pool);
+        ctx->rdata->msg_info.require = hdr;
+    }
+
     parse_generic_array_hdr(hdr, ctx->scanner);
 
-    if (ctx->rdata && ctx->rdata->msg_info.require == NULL)
-        ctx->rdata->msg_info.require = hdr;
-
-    return (pjsip_hdr*)hdr;
+    return new_hdr ? (pjsip_hdr*)hdr : NULL;
 }
 
@@ -1961 +1981 @@
 static pjsip_hdr* parse_hdr_supported(pjsip_parse_ctx *ctx)
 {
-    pjsip_supported_hdr *hdr = pjsip_supported_hdr_create(ctx->pool);
+    pjsip_supported_hdr *hdr;
+    pj_bool_t new_hdr = (ctx->rdata->msg_info.supported == NULL);
+
+    if (ctx->rdata && ctx->rdata->msg_info.supported) {
+        hdr = ctx->rdata->msg_info.supported;
+    } else {
+        hdr = pjsip_supported_hdr_create(ctx->pool);
+        ctx->rdata->msg_info.supported = hdr;
+    }
+
     parse_generic_array_hdr(hdr, ctx->scanner);
-    return (pjsip_hdr*)hdr;
-}
-
+    return new_hdr ? (pjsip_hdr*)hdr : NULL;
+}
 
 /* Parse To: header. */