diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-20 21:28:44 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-20 22:51:41 +0000 |
| commit | c0d6b0ec313432af1f377f696f37746ad7a84cef (patch) | |
| tree | 54f6e02a18872e5dc3bb86b8e9c612b42c25fd59 /epan | |
| parent | 2d0ae39bd6708f00d2b6fb357c1146dcf4d3dbb8 (diff) | |
LLRP: Fix LLRP Custom Parameter Decoding
param_end is the offset+len... and also vendor unknown is not limited to uint32
Bug: 13473
Change-Id: I68cf435f52f28a4a399812f715b38edeecd1e78c
Reviewed-on: https://code.wireshark.org/review/20650
Petri-Dish: 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-llrp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index 1abfce57ae..4bfb2e81c1 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -2253,8 +2253,8 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, suboffset = dissect_llrp_impinj_parameter(tvb, pinfo, param_tree, suboffset, param_end); break; default: - proto_tree_add_item(param_tree, hf_llrp_vendor_unknown, tvb, offset, param_end-4, ENC_NA); - suboffset += param_end-4; + proto_tree_add_item(param_tree, hf_llrp_vendor_unknown, tvb, suboffset, len-4-2-2, ENC_NA); + suboffset += len-4-2-2; break; } break; @@ -3526,7 +3526,7 @@ proto_register_llrp(void) NULL, HFILL }}, { &hf_llrp_vendor_unknown, - { "Vendor Unknown", "llrp.param.vendor_unknown", FT_UINT32, BASE_DEC, NULL, 0, + { "Vendor Unknown", "llrp.param.vendor_unknown", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_llrp_impinj_param_type, |