You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2013/08/19 13:45:20 UTC
svn commit: r1515372 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/ldap/util_ldap_cache.c
Author: trawick
Date: Mon Aug 19 11:45:19 2013
New Revision: 1515372
URL: http://svn.apache.org/r1515372
Log:
mod_ldap: Fix a potential memory leak or corruption.
PR: 54936
Submitted by: Zhenbo Xu <zhenbo1987 gmail com>
Reviewed by: jailletc36, trawick, covener
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/ldap/util_ldap_cache.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1504276
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1515372&r1=1515371&r2=1515372&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Aug 19 11:45:19 2013
@@ -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>]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1515372&r1=1515371&r2=1515372&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Aug 19 11:45:19 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/modules/ldap/util_ldap_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ldap/util_ldap_cache.c?rev=1515372&r1=1515371&r2=1515372&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ldap/util_ldap_cache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ldap/util_ldap_cache.c Mon Aug 19 11:45:19 2013
@@ -52,7 +52,7 @@ void *util_ldap_url_node_copy(util_ald_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;