tvb parameter should not be NULL as the lengths are nonzero.

Change-Id: If085a9fc69bbbf28a7c801930a664c412a4a5b7a
Reviewed-on: https://code.wireshark.org/review/1734
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 7 insertions, 7 deletions

diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index ab1d0e33e8..cc95c3e6db 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -2692,7 +2692,7 @@ static int dissect_time_sync_port_state_info(packet_info *pinfo, proto_tree *tre
 
    for (i = 0; i < num_ports; i++)
    {
-       ti = proto_tree_add_text(tree, NULL, offset+2+i*4, 4, "Port #%d", i+1);
+       ti = proto_tree_add_text(tree, tvb, offset+2+i*4, 4, "Port #%d", i+1);
        port_tree = proto_item_add_subtree(ti, ett_time_sync_port_state_info);
        proto_tree_add_item(port_tree, hf_time_sync_port_state_info_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN);
        proto_tree_add_item(port_tree, hf_time_sync_port_state_info_port_state, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN);
@@ -2725,7 +2725,7 @@ static int dissect_time_sync_port_enable_cfg(packet_info *pinfo, proto_tree *tre
 
    for (i = 0; i < num_ports; i++)
    {
-       ti = proto_tree_add_text(tree, NULL, offset+2+i*4, 4, "Port #%d", i+1);
+       ti = proto_tree_add_text(tree, tvb, offset+2+i*4, 4, "Port #%d", i+1);
        port_tree = proto_item_add_subtree(ti, ett_time_sync_port_enable_cfg);
        proto_tree_add_item(port_tree, hf_time_sync_port_enable_cfg_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN);
        proto_tree_add_item(port_tree, hf_time_sync_port_enable_cfg_port_enable, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN);
@@ -2758,7 +2758,7 @@ static int dissect_time_sync_port_log_announce(packet_info *pinfo, proto_tree *t
 
    for (i = 0; i < num_ports; i++)
    {
-       ti = proto_tree_add_text(tree, NULL, offset+2+i*4, 4, "Port #%d", i+1);
+       ti = proto_tree_add_text(tree, tvb, offset+2+i*4, 4, "Port #%d", i+1);
        port_tree = proto_item_add_subtree(ti, ett_time_sync_port_log_announce);
        proto_tree_add_item(port_tree, hf_time_sync_port_log_announce_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN);
        proto_tree_add_item(port_tree, hf_time_sync_port_log_announce_interval, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN);
@@ -2791,7 +2791,7 @@ static int dissect_time_sync_port_log_sync(packet_info *pinfo, proto_tree *tree,
 
    for (i = 0; i < num_ports; i++)
    {
-       ti = proto_tree_add_text(tree, NULL, offset+2+i*4, 4, "Port #%d", i+1);
+       ti = proto_tree_add_text(tree, tvb, offset+2+i*4, 4, "Port #%d", i+1);
        port_tree = proto_item_add_subtree(ti, ett_time_sync_port_log_sync);
        proto_tree_add_item(port_tree, hf_time_sync_port_log_sync_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN);
        proto_tree_add_item(port_tree, hf_time_sync_port_log_sync_port_log_sync_interval, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN);
@@ -2951,7 +2951,7 @@ static int dissect_time_sync_port_profile_id_info(packet_info *pinfo, proto_tree
 
    for (i = 0; i < num_ports; i++)
    {
-       ti = proto_tree_add_text(tree, NULL, offset+2+i*10, 10, "Port #%d", i+1);
+       ti = proto_tree_add_text(tree, tvb, offset+2+i*10, 10, "Port #%d", i+1);
        port_tree = proto_item_add_subtree(ti, ett_time_sync_port_profile_id_info);
        proto_tree_add_item(port_tree, hf_time_sync_port_profile_id_info_port_num, tvb, offset+2+i*10, 2, ENC_LITTLE_ENDIAN);
        proto_tree_add_item(port_tree, hf_time_sync_port_profile_id_info_profile_id, tvb, offset+4+i*10, 8, ENC_NA);
@@ -2984,7 +2984,7 @@ static int dissect_time_sync_port_phys_addr_info(packet_info *pinfo, proto_tree
 
    for (i = 0; i < num_ports; i++)
    {
-       ti = proto_tree_add_text(tree, NULL, offset+2+i*36, 36, "Port #%d", i+1);
+       ti = proto_tree_add_text(tree, tvb, offset+2+i*36, 36, "Port #%d", i+1);
        port_tree = proto_item_add_subtree(ti, ett_time_sync_port_phys_addr_info);
        proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_port_num, tvb, offset+2+i*36, 2, ENC_LITTLE_ENDIAN);
        proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_phys_proto, tvb, offset+4+i*36, 16, ENC_NA);
@@ -3019,7 +3019,7 @@ static int dissect_time_sync_port_proto_addr_info(packet_info *pinfo, proto_tree
 
    for (i = 0; i < num_ports; i++)
    {
-       ti = proto_tree_add_text(tree, NULL, offset+2+i*22, 22, "Port #%d", i+1);
+       ti = proto_tree_add_text(tree, tvb, offset+2+i*22, 22, "Port #%d", i+1);
        port_tree = proto_item_add_subtree(ti, ett_time_sync_port_proto_addr_info);
        proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_port_num, tvb, offset+2+i*22, 2, ENC_LITTLE_ENDIAN);
        proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_network_proto, tvb, offset+4+i*22, 2, ENC_LITTLE_ENDIAN);