Changeset 3340 for pjproject/trunk

Timestamp:

Oct 13, 2010 9:41:37 AM (14 years ago)

Author:

bennylp

Message:

Fixed #1147: Bug in parsing multipart message bodies (thanks Johan Lantz for the report)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_msg.h (modified) (2 diffs)
• src/pjsip/sip_msg.c (modified) (2 diffs)
• src/pjsip/sip_multipart.c (modified) (1 diff)
• src/pjsip/sip_parser.c (modified) (1 diff)
• src/test/multipart_test.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_msg.h

@@ -547 +547 @@
  * @param mt1           The first media type.
  * @param mt2           The second media type.
+ * @param cmp_param     Specify how to compare the media type parameters:
+ *                       - 0: do not compare parameters
+ *                       - 1: compare parameters but ignore parameters that
+ *                            only appear in one of the media type.
+ *                       - 2: compare the parameters.
  *
  * @return              Zero if both media types are equal, -1 if mt1 < mt2,
@@ -552 +557 @@
  */
 PJ_DECL(int) pjsip_media_type_cmp(const pjsip_media_type *mt1,
-                                  const pjsip_media_type *mt2);
+                                  const pjsip_media_type *mt2,
+                                  int cmp_param);
 
 /**

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -646 +646 @@
  */
 PJ_DEF(int) pjsip_media_type_cmp( const pjsip_media_type *mt1,
-                                  const pjsip_media_type *mt2)
+                                  const pjsip_media_type *mt2,
+                                  pj_bool_t cmp_param)
 {
     int rc;
@@ -658 +659 @@
     if (rc) return rc;
 
-    rc = pjsip_param_cmp(&mt1->param, &mt2->param, 0);
+    if (cmp_param) {
+        rc = pjsip_param_cmp(&mt1->param, &mt2->param, (cmp_param==1));
+    }
 
     return rc;

pjproject/trunk/pjsip/src/pjsip/sip_multipart.c

@@ -397 +397 @@
 
     while (part != &m_data->part_head) {
-        if (pjsip_media_type_cmp(&part->body->content_type, content_type)==0)
+        if (pjsip_media_type_cmp(&part->body->content_type,
+                                 content_type, 0)==0)
+        {
             return part;
+        }
         part = part->next;
     }

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

@@ -1857 +1857 @@
     while (*scanner->curptr == ';') {
         pjsip_param *param = PJ_POOL_ALLOC_T(ctx->pool, pjsip_param);
-        int_parse_param(scanner, ctx->pool, &param->name, &param->value, 0);
+        int_parse_param(scanner, ctx->pool, &param->name, &param->value,
+                        PJSIP_PARSE_REMOVE_QUOTE);
         pj_list_push_back(&hdr->media.param, param);
     }

pjproject/trunk/pjsip/src/test/multipart_test.c

@@ -117 +117 @@
         init_media_type(&mt, h_content_type, h_content_subtype, boundary);
 
-        if (pjsip_media_type_cmp(&ctype_hdr->media, &mt) != 0)
+        if (pjsip_media_type_cmp(&ctype_hdr->media, &mt, 2) != 0)
             return -20;
 
@@ -154 +154 @@
     /* Check content-type: "multipart/mixed;boundary=12345" */
     init_media_type(&mt, "multipart", "mixed", "12345");
-    if (pjsip_media_type_cmp(&body->content_type, &mt) != 0)
+    if (pjsip_media_type_cmp(&body->content_type, &mt, 2) != 0)
         return -200;