From e7141d0ddc940c6076bc69a37c26bd61247de37e Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Thu, 23 Sep 2004 16:55:37 +0000 Subject: [PATCH] Fix a segfault in the LDAP cache when it is configured switched off. PR: Obtained from: Submitted by: Jess Holle Reviewed by: minfrin, bnicholes, trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105268 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 6 +----- modules/experimental/util_ldap_cache_mgr.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 769d0dbe275..0b964650984 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ Changes with Apache 2.0.52 + *) Fix a segfault in the LDAP cache when it is configured switched + off. [Jess Holle ] + *) SECURITY: CAN-2004-0811 (cve.mitre.org) Fix merging of the Satisfy directive, which was applied to the surrounding context and could allow access despite configured diff --git a/STATUS b/STATUS index b3529f6d1c4..ea40616dea8 100644 --- a/STATUS +++ b/STATUS @@ -1,5 +1,5 @@ APACHE 2.0 STATUS: -*-text-*- -Last modified at [$Date: 2004/09/23 16:44:16 $] +Last modified at [$Date: 2004/09/23 16:55:35 $] Release: @@ -100,10 +100,6 @@ PATCHES TO BACKPORT FROM 2.1 in this patch. minfrin: The excess "else" condition has been removed in v1.10. - *) Fix a segfault in the LDAP cache when it is configured switched off. - modules/ldap/util_ldap_cache_mgr.c: 1.7 - +1: minfrin, bnicholes, trawick - *) Use HTML 2.0
for error pages. PR 30732 modules/http/http_protocol.c: r1.483 +1: nd, jorton, trawick, jerenkrantz diff --git a/modules/experimental/util_ldap_cache_mgr.c b/modules/experimental/util_ldap_cache_mgr.c index eb8cc11c227..ff4ba369c49 100644 --- a/modules/experimental/util_ldap_cache_mgr.c +++ b/modules/experimental/util_ldap_cache_mgr.c @@ -212,7 +212,7 @@ void util_ald_cache_purge(util_ald_cache_t *cache) */ util_url_node_t *util_ald_create_caches(util_ldap_state_t *st, const char *url) { - util_url_node_t curl, *newcurl; + util_url_node_t curl, *newcurl = NULL; util_ald_cache_t *search_cache; util_ald_cache_t *compare_cache; util_ald_cache_t *dn_compare_cache; -- 2.47.2