From 995b0bab098777770c6a74308f65a9472ffe7678 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Sun, 13 May 2018 18:34:08 +0200 Subject: [PATCH] ldap: fix issue found by PVS Studio (V1001) The 'offset' variable is assigned but is not used until the end of the function Change-Id: Ib626b81f78b1b59547f451952cbdfb1bf04d2205 Reviewed-on: https://code.wireshark.org/review/27507 Reviewed-by: Anders Broman --- epan/dissectors/asn1/ldap/packet-ldap-template.c | 1 - epan/dissectors/packet-ldap.c | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 94a1b89a49..be679ece64 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -1600,7 +1600,6 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre /* NT Token */ proto_tree_add_item(tree, hf_mscldap_netlogon_nt_token, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 77d254c193..515e19fb4f 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -4518,7 +4518,6 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre /* NT Token */ proto_tree_add_item(tree, hf_mscldap_netlogon_nt_token, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; return tvb_captured_length(tvb); } @@ -5626,7 +5625,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 2143 "./asn1/ldap/packet-ldap-template.c" +#line 2142 "./asn1/ldap/packet-ldap-template.c" }; /* List of subtrees */ @@ -5700,7 +5699,7 @@ void proto_register_ldap(void) { &ett_ldap_T_warning, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 2157 "./asn1/ldap/packet-ldap-template.c" +#line 2156 "./asn1/ldap/packet-ldap-template.c" }; /* UAT for header fields */ static uat_field_t custom_attribute_types_uat_fields[] = { @@ -5888,7 +5887,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2328 "./asn1/ldap/packet-ldap-template.c" +#line 2327 "./asn1/ldap/packet-ldap-template.c" dissector_add_uint_range_with_preference("tcp.port", TCP_PORT_RANGE_LDAP, ldap_handle); }