From 90aa9b4cb3b5c3569d2bb0c39609edb5ff83c488 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 19 Aug 2013 11:45:19 +0000 Subject: [PATCH] mod_ldap: Fix a potential memory leak or corruption. PR: 54936 Submitted by: Zhenbo Xu 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 --- CHANGES | 3 +++ STATUS | 6 ------ modules/ldap/util_ldap_cache.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 1176e8f782..234f614770 100644 --- 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 ] + *) ab: Fix potential buffer overflows when processing the T and X command-line options. PR 55360. [Mike Rumph ] diff --git a/STATUS b/STATUS index d300e26f8b..b14279959f 100644 --- 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 ] - 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 ] trunk: http://svn.apache.org/r1505073 diff --git a/modules/ldap/util_ldap_cache.c b/modules/ldap/util_ldap_cache.c index 87642e114a..b1346f0512 100644 --- 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; -- 2.50.1