diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-05-06 15:51:57 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-05-06 19:56:58 +0000 |
| commit | ef24d48552e889add5291c0c08da0ab3b45ada27 (patch) | |
| tree | 714fa88cc32712051c82eca1b190d016fb023c2d /epan/dissectors/packet-mausb.c | |
| parent | 9a51c1e5306d0d5444096f62619ce8186794a29b (diff) | |
VALS() doesn't take the address of a (pointer to a) value_string, it takes
a pointer to a value_string.
Fixes the fuzz failure reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10079
Bug: 10079
Change-Id: Ifc8d6895cc33ad1f00386a3e59926322bd501125
Reviewed-on: https://code.wireshark.org/review/1538
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mausb.c')
| -rw-r--r-- | epan/dissectors/packet-mausb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 395fd00f90..81db77ef96 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -1091,12 +1091,12 @@ proto_register_mausb(void) static hf_register_info hf[] = { { &hf_mausb_version, { "Version", "mausb.version", FT_UINT8, BASE_DEC, - VALS(&mausb_version_string), MAUSB_VERSION_MASK, NULL, HFILL + VALS(mausb_version_string), MAUSB_VERSION_MASK, NULL, HFILL } }, { &hf_mausb_flags, { "Flags", "mausb.flags", FT_UINT8, BASE_HEX, - VALS(&mausb_flag_string), MAUSB_FLAG_MASK, NULL, HFILL + VALS(mausb_flag_string), MAUSB_FLAG_MASK, NULL, HFILL } }, @@ -1130,7 +1130,7 @@ proto_register_mausb(void) { &hf_mausb_type, { "Type", "mausb.type", FT_UINT8, BASE_HEX, - VALS(&mausb_type_string), 0, NULL, HFILL + VALS(mausb_type_string), 0, NULL, HFILL } }, { &hf_mausb_length, @@ -1184,7 +1184,7 @@ proto_register_mausb(void) }, { &hf_mausb_status, { "Status", "mausb.status", FT_UINT8, BASE_DEC, - VALS(&mausb_status_string), 0, NULL, HFILL + VALS(mausb_status_string), 0, NULL, HFILL } }, @@ -1214,7 +1214,7 @@ proto_register_mausb(void) /* Data Packets Only */ { &hf_mausb_eps, { "EP Status", "mausb.eps", FT_UINT8, BASE_HEX, - VALS(&mausb_eps_string), MAUSB_EPS_MASK, NULL, HFILL + VALS(mausb_eps_string), MAUSB_EPS_MASK, NULL, HFILL } }, { &hf_mausb_eps_rsvd, @@ -1224,7 +1224,7 @@ proto_register_mausb(void) }, { &hf_mausb_tflags, { "Transfer Flags", "mausb.tflag", FT_UINT8, BASE_HEX, - VALS(&mausb_tflag_string), MAUSB_TFLAG_MASK, NULL, HFILL + VALS(mausb_tflag_string), MAUSB_TFLAG_MASK, NULL, HFILL } }, @@ -1249,7 +1249,7 @@ proto_register_mausb(void) }, { &hf_mausb_tflag_type, { "Transfer Type", "mausb.tflag.type", FT_UINT8, BASE_HEX, - VALS(&mausb_transfer_type_string), + VALS(mausb_transfer_type_string), MAUSB_TFLAG_TRANSFER_TYPE << MAUSB_TFLAG_OFFSET, NULL, HFILL } |