aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/ldap/packet-ldap-template.c
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2008-04-07 22:29:27 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2008-04-07 22:29:27 +0000
commit3eac3af53c7701d4d8778313e761e3bd002c1190 (patch)
tree3bd656a7226d0de100135324055401ee05998c0d /asn1/ldap/packet-ldap-template.c
parent14210ca347130a42c578395d57b2aa4e2bf8e444 (diff)
From Jim Young:
Attached is a patch to the ldap_reinit() function to fix bug 2407. This particular bug was triggered by the order of steps used to walk and free the nodes of the ldap_info_items list. This should go into the next 1.0 release. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24838 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/ldap/packet-ldap-template.c')
-rw-r--r--asn1/ldap/packet-ldap-template.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 4dea39ba27..b3536f03a1 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1478,7 +1478,7 @@ ldap_reinit(void)
/* Free up state attached to the ldap_info structures */
for (ldap_info = ldap_info_items; ldap_info != NULL; ) {
- ldap_conv_info_t *last;
+ ldap_conv_info_t *next;
if (ldap_info->auth_mech != NULL) {
g_free(ldap_info->auth_mech);
@@ -1489,9 +1489,9 @@ ldap_reinit(void)
g_hash_table_destroy(ldap_info->unmatched);
ldap_info->unmatched=NULL;
- last = ldap_info;
- ldap_info = ldap_info->next;
+ next = ldap_info->next;
g_free(ldap_info);
+ ldap_info = next;
}
ldap_info_items = NULL;