diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-10-24 18:42:11 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-10-24 18:42:11 +0000 |
commit | cacea3f59b6b280842befcc2f0aac7bff32d91fd (patch) | |
tree | 7d034d0eb60797af8c6a58418de741fee767d64b /epan/dissectors | |
parent | 1340194a625c9bee4b2cbeebf2e2b251723df2a2 (diff) | |
download | wireshark-cacea3f59b6b280842befcc2f0aac7bff32d91fd.tar.gz |
No need to increment offset past bytes in tvb; just return instead.
svn path=/trunk/; revision=45772
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-artnet.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 0ff38b473a..ca7150a770 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -3113,19 +3113,16 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: - if (tree) { + if (tree && tvb_reported_length_remaining(tvb, offset) > 0) { proto_tree_add_text(artnet_tree, tvb, offset, -1, "Data (%d bytes)", tvb_reported_length_remaining(tvb, offset)); - offset += tvb_reported_length_remaining(tvb, offset); } - break; + return; } - if (tree) { - if (tvb_reported_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(artnet_tree, hf_artnet_excess_bytes, tvb, - offset, tvb_reported_length_remaining(tvb, offset), ENC_NA); - } + if (tree && tvb_reported_length_remaining(tvb, offset) > 0) { + proto_tree_add_item(artnet_tree, hf_artnet_excess_bytes, tvb, + offset, tvb_reported_length_remaining(tvb, offset), ENC_NA); } } |