diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-12-18 16:55:37 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-12-19 21:03:04 +0000 |
| commit | d0d15ef5df75bec136c3d3cf2b76a9b4de5d436d (patch) | |
| tree | 539d32c40bb03e2ca8244c2fe00d95a99427eaf7 /epan/dissectors/asn1/h245 | |
| parent | 8521dbbe67ddc7947e6e16b69c7fb4430abbc938 (diff) | |
Avoid ASN.1 frame.protocols duplication.
Some of the ASN.1 dissectors process their data indirectly through
dissector tables. Add dissector_try_string_new so that they can do so
without appending duplicate entries to frame.protocols.
Change-Id: If9e12d81f9d0cc5b3bf19816e675a0fb79d904a6
Reviewed-on: https://code.wireshark.org/review/24886
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/asn1/h245')
| -rw-r--r-- | epan/dissectors/asn1/h245/h245.cnf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/asn1/h245/h245.cnf b/epan/dissectors/asn1/h245/h245.cnf index 2dabaaf9ff..e4425a83de 100644 --- a/epan/dissectors/asn1/h245/h245.cnf +++ b/epan/dissectors/asn1/h245/h245.cnf @@ -715,7 +715,7 @@ if (h245_pi != NULL) if (gefx) { ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); PROTO_ITEM_SET_HIDDEN(ti); - dissector_try_string(gef_name_dissector_table, gefx->key, tvb_new_subset_length_caplen(tvb, offset>>3, 0, 0), actx->pinfo, tree, actx); + dissector_try_string_new(gef_name_dissector_table, gefx->key, tvb_new_subset_length_caplen(tvb, offset>>3, 0, 0), actx->pinfo, tree, FALSE, actx); } actx->private_data = gefx; /* subdissector could overwrite it */ #.END @@ -745,7 +745,7 @@ if (h245_pi != NULL) ti = proto_tree_add_string(tree, hf_h245_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); PROTO_ITEM_SET_HIDDEN(ti); add_new_data_source(%(ACTX)s->pinfo, value_tvb, "booleanArray"); - dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); + dissector_try_string_new(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, FALSE, %(ACTX)s); } #.END #.FN_BODY ParameterValue/unsignedMin VAL_PTR = &value |