summaryrefslogtreecommitdiff
path: root/asn1/ldap/packet-ldap-template.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2009-03-27 12:16:02 +0000
committerBill Meier <wmeier@newsguy.com>2009-03-27 12:16:02 +0000
commitcb3db511f6fad21930292ce97cdda8c117c18dc8 (patch)
tree4df7c98030d119725568d9fc475aba849fcdcfbe /asn1/ldap/packet-ldap-template.c
parent07a02beb98be6544c28687edbcbbd5fe87a99a3b (diff)
downloadwireshark-cb3db511f6fad21930292ce97cdda8c117c18dc8.tar.gz
As suggested by Jakob Zawadzki: (Bug #3311): g_free() is NULL safe, so we don't need check against it.
svn path=/trunk/; revision=27861
Diffstat (limited to 'asn1/ldap/packet-ldap-template.c')
-rw-r--r--asn1/ldap/packet-ldap-template.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 9158419199..ed0e2ea933 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1794,14 +1794,9 @@ ldap_reinit(void)
for (ldap_info = ldap_info_items; ldap_info != NULL; ) {
ldap_conv_info_t *next;
- if (ldap_info->auth_mech != NULL) {
- g_free(ldap_info->auth_mech);
- ldap_info->auth_mech=NULL;
- }
+ g_free(ldap_info->auth_mech);
g_hash_table_destroy(ldap_info->matched);
- ldap_info->matched=NULL;
g_hash_table_destroy(ldap_info->unmatched);
- ldap_info->unmatched=NULL;
next = ldap_info->next;
g_free(ldap_info);