Check that value_string values fit into field width

14 files changed, 27 insertions, 21 deletions

diff --git a/epan/dissectors/asn1/h450/packet-h450-template.c b/epan/dissectors/asn1/h450/packet-h450-template.c
index 724882779a..57d9a6fdc3 100644
--- a/epan/dissectors/asn1/h450/packet-h450-template.c
+++ b/epan/dissectors/asn1/h450/packet-h450-template.c
@@ -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"
   };
diff --git a/epan/dissectors/asn1/qsig/packet-qsig-template.c b/epan/dissectors/asn1/qsig/packet-qsig-template.c
index 25b32442f1..a6b4042aea 100644
--- a/epan/dissectors/asn1/qsig/packet-qsig-template.c
+++ b/epan/dissectors/asn1/qsig/packet-qsig-template.c
@@ -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,
diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c
index 8114730607..05d394979b 100644
--- a/epan/dissectors/packet-dhcp.c
+++ b/epan/dissectors/packet-dhcp.c
@@ -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,
diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c
index 2ddf0382cc..592a828d67 100644
--- a/epan/dissectors/packet-gmr1_rr.c
+++ b/epan/dissectors/packet-gmr1_rr.c
@@ -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" },
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index 456d2ccdd6..0615832d52 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -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 --- --- --- */
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index 4ff814c21b..ee8ca77d8c 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -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},
diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c
index da91349e4e..dd5246f582 100644
--- a/epan/dissectors/packet-nstrace.c
+++ b/epan/dissectors/packet-nstrace.c
@@ -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 }
 		},
 
diff --git a/epan/dissectors/packet-optommp.c b/epan/dissectors/packet-optommp.c
index e4942f24ac..39ae6573b0 100644
--- a/epan/dissectors/packet-optommp.c
+++ b/epan/dissectors/packet-optommp.c
@@ -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" },
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 06913f44d0..c4b8a72299 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -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
             }
         },
diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c
index 9cc6dbf71e..600e71afd7 100644
--- a/epan/dissectors/packet-pdcp-nr.c
+++ b/epan/dissectors/packet-pdcp-nr.c
@@ -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
             }
         },
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index b049187f27..9fdb494b23 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -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,
diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c
index 8f2913ddee..82806e8286 100644
--- a/epan/dissectors/packet-rohc.c
+++ b/epan/dissectors/packet-rohc.c
@@ -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++;
 
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 303911fc4e..e689b3cc7b 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -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 }
         },
diff --git a/plugins/epan/gryphon/packet-gryphon.c b/plugins/epan/gryphon/packet-gryphon.c
index 969dc8abb1..86d035b7b6 100644
--- a/plugins/epan/gryphon/packet-gryphon.c
+++ b/plugins/epan/gryphon/packet-gryphon.c
@@ -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 }},