Fix #7056 + Remove mechanism global, unused variable.

svn path=/trunk/; revision=42008

diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index e22c96ea9aedc9f115204a6275e0ed0b1a9586cc..b1223b18f8b22c74a4fa96e919a1974c33754d58 100644 (file)
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -718,7 +718,6 @@ static gint Filter_length;
 static gint Filter_elements;
 
 /* Global variables */
-char *mechanism = NULL;
 static gint MessageID =-1;
 static gint ProtocolOp = -1;
 static gint result = 0;
@@ -983,6 +982,28 @@ ldap_frame_end(void)
 {
    ldap_found_in_frame = FALSE;
    attr_type = NULL;
+   ldapvalue_string = NULL;
+/* ? */
+   attributedesc_string = NULL;
+   Filter_string = NULL;
+   and_filter_string = NULL;
+   object_identifier_id = NULL;
+   or_filter_string = NULL;
+
+   substring_item_any = NULL;
+   substring_item_final = NULL;
+   substring_item_init = NULL;
+   substring_value = NULL;
+
+   ldm_tree = NULL;
+
+   Filter_elements = 0;
+   Filter_length = 0;
+   do_protocolop = FALSE;
+   result = 0;
+
+/* seems to be ok, but reset just in case */
+   matching_rule_string = NULL;
 }
 
 static void

diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 68d5a6a655b782a5e962c943ea51fbb0124f1ad6..d6ce20cdee8d66c4e225f7563683d41a4323f556 100644 (file)
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -937,7 +937,6 @@ static gint Filter_length;
 static gint Filter_elements;
 
 /* Global variables */
-char *mechanism = NULL;
 static gint MessageID =-1;
 static gint ProtocolOp = -1;
 static gint result = 0;
@@ -3840,7 +3839,7 @@ static void dissect_PasswordPolicyResponseValue_PDU(tvbuff_t *tvb _U_, packet_in
 
 
 /*--- End of included file: packet-ldap-fn.c ---*/
-#line 879 "../../asn1/ldap/packet-ldap-template.c"
+#line 878 "../../asn1/ldap/packet-ldap-template.c"
 
 static void
 dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo,
@@ -3948,6 +3947,28 @@ ldap_frame_end(void)
 {
    ldap_found_in_frame = FALSE;
    attr_type = NULL;
+   ldapvalue_string = NULL;
+/* ? */
+   attributedesc_string = NULL;
+   Filter_string = NULL;
+   and_filter_string = NULL;
+   object_identifier_id = NULL;
+   or_filter_string = NULL;
+
+   substring_item_any = NULL;
+   substring_item_final = NULL;
+   substring_item_init = NULL;
+   substring_value = NULL;
+
+   ldm_tree = NULL;
+
+   Filter_elements = 0;
+   Filter_length = 0;
+   do_protocolop = FALSE;
+   result = 0;
+
+/* seems to be ok, but reset just in case */
+   matching_rule_string = NULL;
 }
 
 static void
@@ -5746,7 +5767,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ldap-hfarr.c ---*/
-#line 2204 "../../asn1/ldap/packet-ldap-template.c"
+#line 2225 "../../asn1/ldap/packet-ldap-template.c"
   };
 
   /* List of subtrees */
@@ -5821,7 +5842,7 @@ void proto_register_ldap(void) {
     &ett_ldap_T_warning,
 
 /*--- End of included file: packet-ldap-ettarr.c ---*/
-#line 2217 "../../asn1/ldap/packet-ldap-template.c"
+#line 2238 "../../asn1/ldap/packet-ldap-template.c"
   };
   /* UAT for header fields */
   static uat_field_t custom_attribute_types_uat_fields[] = {
@@ -5978,7 +5999,7 @@ proto_reg_handoff_ldap(void)
 
 
 /*--- End of included file: packet-ldap-dis-tab.c ---*/
-#line 2357 "../../asn1/ldap/packet-ldap-template.c"
+#line 2378 "../../asn1/ldap/packet-ldap-template.c"
 
 
 }