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

Check that value_string values fit into field width

This commit is contained in:
Martin Mathieson 2023-02-20 08:33:34 +00:00
parent af82679d9a
commit f4e9b9d4a8
14 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/h450/packet-h450-template.c
View File

@ -247,7 +247,7 @@ void proto_register_h450(void) {
FT_UINT8, BASE_DEC, VALS(h450_str_operation), 0x0,
NULL, HFILL }},
{ &hf_h450_error, { "Error", "h450.error",
FT_UINT8, BASE_DEC, VALS(h450_str_error), 0x0,
FT_UINT16, BASE_DEC, VALS(h450_str_error), 0x0,
NULL, HFILL }},
#include "packet-h450-hfarr.c"
};

2
epan/dissectors/asn1/qsig/packet-qsig-template.c
View File

@ -603,7 +603,7 @@ void proto_register_qsig(void) {
FT_UINT8, BASE_DEC, VALS(qsig_str_operation), 0x0,
NULL, HFILL }},
{ &hf_qsig_service, { "Service", "qsig.service",
FT_UINT8, BASE_DEC, VALS(qsig_str_service), 0x0,
FT_UINT16, BASE_DEC, VALS(qsig_str_service), 0x0,
"Supplementary Service", HFILL }},
{ &hf_qsig_error, { "Error", "qsig.error",
FT_UINT8, BASE_DEC, VALS(qsig_str_error), 0x0,

2
epan/dissectors/packet-dhcp.c
View File

@ -7538,7 +7538,7 @@ proto_register_dhcp(void)
{ &hf_dhcp_pkt_mta_cap_type,
{ "Type", "dhcp.vendor.pktc.mta_cap_type",
FT_UINT8, BASE_DEC, VALS(pkt_mdc_type_vals), 0x0,
FT_UINT16, BASE_DEC, VALS(pkt_mdc_type_vals), 0x0,
NULL, HFILL }},
{ &hf_dhcp_pkt_mdc_supp_flow_secure,

1
epan/dissectors/packet-gmr1_rr.c
View File

@ -1621,6 +1621,7 @@ static const value_string gmr1_msg_rr_strings[] = {
{ 0x3f, "Immediate Assignment" },
{ 0x3a, "Immediate Assignment Reject Type 1" },
{ 0x3b, "Immediate Assignment Reject Type 2" },
/* N.B. these next 2 entries won't fit into one byte this field seems to occupy... */
{ 0x13e, "Extended Immediate Assignment" }, /* Conflict ... add 0x100 */
{ 0x13b, "Extended Imm. Assignment Reject" }, /* Conflict ... add 0x100 */
{ 0x39, "Position Verification Notify" },

2
epan/dissectors/packet-h450.c
View File

@ -4792,7 +4792,7 @@ void proto_register_h450(void) {
FT_UINT8, BASE_DEC, VALS(h450_str_operation), 0x0,
NULL, HFILL }},
{ &hf_h450_error, { "Error", "h450.error",
FT_UINT8, BASE_DEC, VALS(h450_str_error), 0x0,
FT_UINT16, BASE_DEC, VALS(h450_str_error), 0x0,
NULL, HFILL }},
/* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */

20
epan/dissectors/packet-mip6.c
View File

@ -571,17 +571,17 @@ static const value_string pmip6_ipv4aa_status_values[] = {
/* PMIP6 BRI R. Trigger values */
static const value_string pmip6_bri_rtrigger[] = {
{ 0x00, "Unspecified"},
{ 0x01, "Administrative Reason"},
{ 0x02, "Inter-MAG Handover - same Access Type"},
{ 0x03, "Inter-MAG Handover - different Access Type"},
{ 0x04, "Inter-MAG Handover - Unknown"},
{ 0x05, "User Initiated Session(s) Termination"},
{ 0x06, "Access Network Session(s) Termination"},
{ 0x07, "Possible Out-of Sync BCE State"},
{ 0, "Unspecified"},
{ 1, "Administrative Reason"},
{ 2, "Inter-MAG Handover - same Access Type"},
{ 3, "Inter-MAG Handover - different Access Type"},
{ 4, "Inter-MAG Handover - Unknown"},
{ 5, "User Initiated Session(s) Termination"},
{ 6, "Access Network Session(s) Termination"},
{ 7, "Possible Out-of Sync BCE State"},
/* 8-127 Unassigned */
{ 0x128, "Per-Peer Policy"},
{ 0x129, "Revoking Mobility Node Local Policy"},
{ 128, "Per-Peer Policy"},
{ 129, "Revoking Mobility Node Local Policy"},
/* 130-249 Unassigned */
/* 250-255 Reserved for Testing Purposes Only */
{ 0, NULL},

2
epan/dissectors/packet-nstrace.c
View File

@ -980,7 +980,7 @@ proto_register_ns(void)
{ &hf_ns_dir,
{ "Operation", "nstrace.dir",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ns_dir_vals_ext, 0x0,
FT_UINT16, BASE_HEX|BASE_EXT_STRING, &ns_dir_vals_ext, 0x0,
NULL, HFILL }
},

2
epan/dissectors/packet-optommp.c
View File

@ -207,7 +207,7 @@ static const range_string optommp_mm_areas[] = {
"Public I/O Tag Configuration (Channels 0-31) - Read/Write" },
{ 0xF2290000, 0xF2295FFF,
"Public Tag Revision Number" },
{ 0xF2293000, 0xF228FFFF,
{ 0xF2293000, 0xF229FFFF,
"Public PID Tag Configuration" },
{ 0xF22A0000, 0xF22AFFFF,
"Public I/O Tag Configuration (Channels 32-63) - Read/Write" },

2
epan/dissectors/packet-pdcp-lte.c
View File

@ -2717,7 +2717,7 @@ void proto_register_pdcp_lte(void)
},
{ &hf_pdcp_lte_rohc_profile,
{ "ROHC profile",
"pdcp-lte.rohc.profile", FT_UINT8, BASE_DEC, VALS(rohc_profile_vals), 0x0,
"pdcp-lte.rohc.profile", FT_UINT16, BASE_DEC, VALS(rohc_profile_vals), 0x0,
"ROHC Mode", HFILL
}
},

2
epan/dissectors/packet-pdcp-nr.c
View File

@ -2730,7 +2730,7 @@ void proto_register_pdcp_nr(void)
},
{ &hf_pdcp_nr_rohc_profile,
{ "ROHC profile",
"pdcp-nr.rohc.profile", FT_UINT8, BASE_DEC, VALS(rohc_profile_vals), 0x0,
"pdcp-nr.rohc.profile", FT_UINT16, BASE_DEC, VALS(rohc_profile_vals), 0x0,
"ROHC Mode", HFILL
}
},

2
epan/dissectors/packet-qsig.c
View File

@ -12568,7 +12568,7 @@ void proto_register_qsig(void) {
FT_UINT8, BASE_DEC, VALS(qsig_str_operation), 0x0,
NULL, HFILL }},
{ &hf_qsig_service, { "Service", "qsig.service",
FT_UINT8, BASE_DEC, VALS(qsig_str_service), 0x0,
FT_UINT16, BASE_DEC, VALS(qsig_str_service), 0x0,
"Supplementary Service", HFILL }},
{ &hf_qsig_error, { "Error", "qsig.error",
FT_UINT8, BASE_DEC, VALS(qsig_str_error), 0x0,

5
epan/dissectors/packet-rohc.c
View File

@ -2429,7 +2429,10 @@ dissect_rohc_ir_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
proto_tree_add_item(ir_tree, hf_rohc_d_bit, tvb, x_bit_offset, 1, ENC_BIG_ENDIAN);
}
/* Profile */
/* Profile.
* In the IR packet, the profile identifier is abbreviated to the 8 least
* significant bits. It selects the highest-number profile in the
* channel state parameter PROFILES that matches the 8 LSBs given. */
proto_tree_add_item(ir_tree, hf_rohc_profile, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;

2
epan/dissectors/packet-rtcp.c
View File

@ -7995,7 +7995,7 @@ proto_register_rtcp(void)
NULL, HFILL }
},
{ &hf_rtcp_mccp_ipv6,
{ "IP Address", "rtcp.app_data.mccp.ipv4",
{ "IP Address", "rtcp.app_data.mccp.ipv6",
FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},

2
plugins/epan/gryphon/packet-gryphon.c
View File

@ -4006,6 +4006,7 @@ decode_response(tvbuff_t *tvb, packet_info* pinfo, int offset, int src, proto_tr
/* this is the old original way of displaying */
proto_tree_add_uint(pt, hf_gryphon_command, tvb, offset, 1, cmd);
if (pkt_info->ioctl_command != 0) {
/* N.B. Shown in one byte, but ioctl_command is a 4-byte value */
proto_tree_add_uint(pt, hf_gryphon_cmd_ioctl_context, tvb, offset + 1, 1, pkt_info->ioctl_command);
} else {
proto_tree_add_item(pt, hf_gryphon_cmd_context, tvb, offset + 1, 1, ENC_NA);
@ -4378,6 +4379,7 @@ proto_register_gryphon(void)
{ &hf_gryphon_cmd_context,
{ "Context", "gryphon.cmd.context", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/* N.B. Shown in one byte, but ioctl_command is a 4-byte value */
{ &hf_gryphon_cmd_ioctl_context,
{ "IOCTL Response", "gryphon.cmd.ioctl_response", FT_UINT8, BASE_DEC, VALS(ioctls), 0x0,
NULL, HFILL }},