mod_ldap: Fix a potential memory leak or corruption.

PR: 54936
Submitted by: Zhenbo Xu <zhenbo1987 gmail com>
Reviewed by: jailletc36, trawick, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1515372 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 1176e8f782a318b5b85a27486ddbf70235ec0ad5..234f614770e3ba3b491d6cb0a343bb8f9a8e5f28 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.7
 
+  *) mod_ldap: Fix a potential memory leak or corruption.  PR 54936.
+     [Zhenbo Xu <zhenbo1987 gmail com>]
+
   *) ab: Fix potential buffer overflows when processing the T and X
      command-line options.  PR 55360.
      [Mike Rumph <mike.rumph oracle.com>]

diff --git a/STATUS b/STATUS
index d300e26f8bb6d4fda5c75abfa7fc3a7f98842550..b14279959f81eb83de78fed8a389488af19c05f3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -104,12 +104,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://svn.apache.org/r1514214
         http://svn.apache.org/r1514617
 
-  * mod_ldap: Fix an unlikely potential memory leak.
-    PR54936 [Zhenbo Xu <zhenbo1987 gmail com>]
-    trunk: http://svn.apache.org/r1504276
-    2.4.x patch: trunk patch works
-    +1: jailletc36, trawick (util_ald_free(NULL) seems nastier than a memory leak), covener
-
   * Makefile.win: Install proper pcre DLL file during debug build install
     PR55235 [Ben Reser <ben reser org>]
     trunk: http://svn.apache.org/r1505073

diff --git a/modules/ldap/util_ldap_cache.c b/modules/ldap/util_ldap_cache.c
index 87642e114a70dfa42523be755ef943401579293f..b1346f05121c41c76cc11b6e9cbc4434a2c41777 100644 (file)
--- a/modules/ldap/util_ldap_cache.c
+++ b/modules/ldap/util_ldap_cache.c
@@ -52,7 +52,7 @@ void *util_ldap_url_node_copy(util_ald_cache_t *cache, void *c)
 
     if (node) {
         if (!(node->url = util_ald_strdup(cache, n->url))) {
-            util_ald_free(cache, node->url);
+            util_ald_free(cache, node);
             return NULL;
         }
         node->search_cache = n->search_cache;