osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Alexis La Goutte 2017-03-20 21:28:44 +01:00 committed by Michael Mann
parent 2d0ae39bd6
commit c0d6b0ec31
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-llrp.c
View File

@ -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,