diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-04-25 11:39:06 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-04-25 17:17:12 +0000 |
| commit | a4da88a3d0cc0b067c45fe8fc9c4b85a687ef6eb (patch) | |
| tree | 388d12a8bb9376f9f64cd13e3d9bb9a970c9dabb /epan | |
| parent | 83924c867d10686b2f93f61733d6ecd8002341ad (diff) | |
| download | wireshark-a4da88a3d0cc0b067c45fe8fc9c4b85a687ef6eb.tar.gz | |
J1939 can have 0 bytes of "packet data" (i.e. just CAN ID), so use tvb_reported_length instead of -1.
Bug: 12366
Change-Id: Id702572b95c3500906ce12ee9658ded132611247
Reviewed-on: https://code.wireshark.org/review/15108
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-j1939.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index db8edc6dd6..4cbf5a7a13 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -196,7 +196,7 @@ static int dissect_j1939(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo col_set_str(pinfo->cinfo, COL_PROTOCOL, "J1939"); col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_j1939, tvb, offset, -1, ENC_NA); + ti = proto_tree_add_item(tree, proto_j1939, tvb, offset, tvb_reported_length(tvb), ENC_NA); j1939_tree = proto_item_add_subtree(ti, ett_j1939); can_tree = proto_tree_add_subtree_format(j1939_tree, tvb, 0, 0, @@ -247,14 +247,14 @@ static int dissect_j1939(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* For now just include raw bytes */ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, 0, data_length, ' ')); - msg_tree = proto_tree_add_subtree(j1939_tree, tvb, 0, -1, ett_j1939_message, NULL, "Message"); + msg_tree = proto_tree_add_subtree(j1939_tree, tvb, 0, tvb_reported_length(tvb), ett_j1939_message, NULL, "Message"); ti = proto_tree_add_uint(msg_tree, hf_j1939_pgn, tvb, 0, 0, pgn); PROTO_ITEM_SET_GENERATED(ti); if (!dissector_try_uint_new(subdissector_pgn_table, pgn, tvb, pinfo, msg_tree, TRUE, data)) { - proto_tree_add_item(msg_tree, hf_j1939_data, tvb, 0, -1, ENC_NA); + proto_tree_add_item(msg_tree, hf_j1939_data, tvb, 0, tvb_reported_length(tvb), ENC_NA); } return tvb_captured_length(tvb); |