From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 22 Sep 2004 08:01:41 +0000 (+0000)
Subject: jean-claude Chauve fixed an LDAP bug
X-Git-Tag: upstream/7.37.1~12108
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7676f402186203b6dc0a0f7581f6d1a545213300;p=platform%2Fupstream%2Fcurl.git

jean-claude Chauve fixed an LDAP bug
---

diff --git a/CHANGES b/CHANGES
index b9012dd..70f9bcb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel (22 September 2004)
+- Jean-Claude Chauve fixed an LDAP crash when more than one record was
+  retrieved.
+
 Daniel (19 September 2004)
 - Andreas Rieke pointed out that when attempting to connect to a host without
   a service on the specified port, curl_easy_perform() didn't properly provide
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d48bdaf..b6a3c51 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,7 +15,8 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
- o connect failures properly writes error message in errorbuffer
+ o LDAP crash when more than one record was received
+ o connect failures properly stores an error message in the errorbuffer
  o Rare Location:-following problem with bad original URL
  o -F can now add Content-Type on non-file sections
  o double Host: header when following Location: with replaced Host: fixed
diff --git a/lib/ldap.c b/lib/ldap.c
index 4402950..27bccdc 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -350,8 +350,8 @@ CURLcode Curl_ldap(struct connectdata *conn)
       Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 1);
 
       (*ldap_memfree)(attribute);
-      (*ldap_memfree)(dn);
     }
+    (*ldap_memfree)(dn);
     if (ber)
        (*ber_free)(ber, 0);
   }