diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-12-17 20:06:03 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-12-17 20:06:03 +0000 |
| commit | 6db9eb0b73b4bb02864ab389c74f5a17a9da50e2 (patch) | |
| tree | af1850b2836d9158fdea0d4a38264297bdb7eb6e /epan/dissectors/packet-mbtcp.c | |
| parent | c03bcb5694874e4dd32a701bb5258d6f00bd873a (diff) | |
Bugfix OpenSafety "heuristics" to only consider a packet "handled" if a subdissector is called. Fixes bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572)
Also removed tree check in Modbus dissector because dissector_try_string() is being called under it.
#BACKPORT(1.10)
svn path=/trunk/; revision=54193
Diffstat (limited to 'epan/dissectors/packet-mbtcp.c')
| -rw-r--r-- | epan/dissectors/packet-mbtcp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index f3f0ef732b..136ef1e7f7 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -854,10 +854,6 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ guint16 diagnostic_code; modbus_request_info_t *request_info; - /* Don't need to do anything if there's no tree */ - if (tree == NULL) - return tvb_length(tvb); - len = tvb_length_remaining(tvb, 0); /* If the packet is zero-length, we should not attempt to dissect any further */ |