osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

simple: fix value_string type mismatch with simple.link16.rc 

Due to alignment, mapping a range_string as value_string happens to work
on 64-bit systems. On 32-bit systems it will treat it as an empty list.
In either case, this type confusion is undesired, fix accordingly.

Change-Id: I6f1a249caf822acae2628e7f2df492bab6cc1c5c
Fixes: v2.1.0rc0-1726-geeae61bc93 ("packet-simple: SIMPLE dissector")
Reviewed-on: https://code.wireshark.org/review/29751
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Peter Wu 2018-09-20 00:07:07 +02:00 committed by Alexis La Goutte
parent e8c6735bcd
commit 081c72344c
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-simple.c
View File

@ -88,12 +88,6 @@ static const value_string Link16_Subtype_Strings[] = {
{ 0, NULL },
};
static const range_string Link16_RC_Strings[] = {
{ 0, 0, "Not required" },
{ 1, 255, "Required" },
{ 0, 0, NULL },
};
static const value_string Status_Subtype_Strings[] = {
{ 1, "Node Status" },
{ 0, NULL },
@ -528,7 +522,7 @@ void proto_register_simple(void)
{ "Subtype", "simple.link16.subtype", FT_UINT8, BASE_DEC, VALS(Link16_Subtype_Strings), 0x0,
NULL, HFILL }},
{ &hf_simple_link16_rc,
{ "R/C Flag", "simple.link16.rc", FT_UINT8, BASE_DEC, VALS(Link16_RC_Strings), 0x0,
{ "R/C Flag", "simple.link16.rc", FT_BOOLEAN, BASE_DEC, TFS(&tfs_required_not_required), 0x0,
NULL, HFILL }},
{ &hf_simple_link16_network,
{ "Network", "simple.link16.network", FT_UINT8, BASE_DEC, NULL, 0x0,