Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new.

svn path=/trunk/; revision=53049

1 files changed, 2 insertions, 2 deletions

diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index 5df778e834..b413667e02 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -743,13 +743,13 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary,
              * First try the dedicated multipart dissector table
              */
             dissected = dissector_try_string(multipart_media_subdissector_table,
-                        content_type_str, tmp_tvb, pinfo, subtree);
+                        content_type_str, tmp_tvb, pinfo, subtree, NULL);
             if (! dissected) {
                 /*
                  * Fall back to the default media dissector table
                  */
                 dissected = dissector_try_string(media_type_dissector_table,
-                        content_type_str, tmp_tvb, pinfo, subtree);
+                        content_type_str, tmp_tvb, pinfo, subtree, NULL);
             }
             if (! dissected) {
                 const char *save_match_string = pinfo->match_string;