diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-04-21 14:12:59 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-04-23 02:09:16 +0000 |
| commit | 3a42b55ac90f9d9aef943bb02c8d2c6444019ba8 (patch) | |
| tree | 521d9426fb3a9d8bb2375491c5d527fe07ac8da9 /epan/dissectors | |
| parent | 7ccab8a6e183a535e1176e856852e2f574e76d43 (diff) | |
idl2wrs: don't use -1 for the protocol-item length.
It doesn't work any more for empty (length==0) PDUs.
Similar to bug 10646/Ifb96768969a43c59367b73e7bb940ceeb02cf6b0 (for RPC).
Untested as I'm not set up to build IDL dissectors now.
Bug: 11134
Change-Id: I77aacc2590acbacbe02edb1768e754f92f87bc23
Reviewed-on: https://code.wireshark.org/review/8163
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-coseventcomm.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-cosnaming.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-gias.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-parlay.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-tango.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-coseventcomm.c b/epan/dissectors/packet-coseventcomm.c index faa6c67bc5..92224d2580 100644 --- a/epan/dissectors/packet-coseventcomm.c +++ b/epan/dissectors/packet-coseventcomm.c @@ -341,7 +341,7 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs */ if (ptree) { - ti = proto_tree_add_item(ptree, proto_coseventcomm, tvb, *offset, -1, ENC_NA); + ti = proto_tree_add_item(ptree, proto_coseventcomm, tvb, *offset, tvb_reported_length_remaining(tvb, *offset), ENC_NA); tree = proto_item_add_subtree(ti, ett_coseventcomm); } return tree; diff --git a/epan/dissectors/packet-cosnaming.c b/epan/dissectors/packet-cosnaming.c index d9f5929b03..4c9b28ba1c 100644 --- a/epan/dissectors/packet-cosnaming.c +++ b/epan/dissectors/packet-cosnaming.c @@ -874,7 +874,7 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs */ if (ptree) { - ti = proto_tree_add_item(ptree, proto_cosnaming, tvb, *offset, -1, ENC_NA); + ti = proto_tree_add_item(ptree, proto_cosnaming, tvb, *offset, tvb_reported_length_remaining(tvb, *offset), ENC_NA); tree = proto_item_add_subtree(ti, ett_cosnaming); } return tree; diff --git a/epan/dissectors/packet-gias.c b/epan/dissectors/packet-gias.c index 2d43c1c6b0..dc35867aa4 100644 --- a/epan/dissectors/packet-gias.c +++ b/epan/dissectors/packet-gias.c @@ -7028,7 +7028,7 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs */ if (ptree) { - ti = proto_tree_add_item(ptree, proto_gias, tvb, *offset, -1, ENC_NA); + ti = proto_tree_add_item(ptree, proto_gias, tvb, *offset, tvb_reported_length_remaining(tvb, *offset), ENC_NA); tree = proto_item_add_subtree(ti, ett_gias); } return tree; diff --git a/epan/dissectors/packet-parlay.c b/epan/dissectors/packet-parlay.c index 959f4003cc..f5f660b602 100644 --- a/epan/dissectors/packet-parlay.c +++ b/epan/dissectors/packet-parlay.c @@ -56909,7 +56909,7 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs */ if (ptree) { - ti = proto_tree_add_item(ptree, proto_parlay, tvb, *offset, -1, ENC_NA); + ti = proto_tree_add_item(ptree, proto_parlay, tvb, *offset, tvb_reported_length_remaining(tvb, *offset), ENC_NA); tree = proto_item_add_subtree(ti, ett_parlay); } return tree; diff --git a/epan/dissectors/packet-tango.c b/epan/dissectors/packet-tango.c index 5d84a12b9b..38e40fce70 100644 --- a/epan/dissectors/packet-tango.c +++ b/epan/dissectors/packet-tango.c @@ -2445,7 +2445,7 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs */ if (ptree) { - ti = proto_tree_add_item(ptree, proto_tango, tvb, *offset, -1, ENC_NA); + ti = proto_tree_add_item(ptree, proto_tango, tvb, *offset, tvb_reported_length_remaining(tvb, *offset), ENC_NA); tree = proto_item_add_subtree(ti, ett_tango); } return tree; |