diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2012-09-19 16:56:59 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2012-09-19 16:56:59 +0000 |
| commit | d729f21ad293e7cf5bd295318b564853a7330f7f (patch) | |
| tree | bc35df403bf5dbf3a106fedc44918241748a5032 /epan/dissectors/packet-wsp.c | |
| parent | a232ae9242177783bc260311b160d5110e809883 (diff) | |
Revert r45005.
svn path=/trunk/; revision=45006
Diffstat (limited to 'epan/dissectors/packet-wsp.c')
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 5af9b26704..cef1082a0c 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -4964,6 +4964,17 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* In the interest of speed, if "tree" is NULL, don't do any work not * necessary to generate protocol tree items. */ if (tree) { + + /* We use proto_item_append_string() in a number of places. + * It does not work with the TRY_TO_FAKE_THIS_ITEM speed + * optimization, so we have to disable that one and become + * "slow" by pretending that the tree is "visible". + * + * This code must be present for the MMSE dissector which + * calls this function; otherwise, this causes a + * dissector_assert [bug 492] (proto_item_append_string() + * issue), and similar problems occur in other places. + */ proto_tree_set_visible(tree, TRUE); proto_ti = proto_tree_add_item(tree, proto_wsp, |