mod_cache: Fix uninitialized tmppath variable.

PR: 54949
Submitted by: <jkaluza redhat.com>
Reviewed by: minfrin, trawick, wrowe

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

diff --git a/STATUS b/STATUS
index fa790bacb8d256a9c0b21b75415c8839e0ff6d85..78d3181d28a715567be48d9e421b719828f9ee6c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -114,11 +114,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
   
-  * mod_cache: Fix uninitialized tmppath variable. PR 54949
-    trunk patch: Variable removed from trunk in http://svn.apache.org/r1407381
-    2.2.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-tmppath.patch
-    +1: minfrin, trawick, wrowe
-
   * mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
     the source href (sent as part of the request body as XML) pointing to a
     URI that is not configured for DAV will trigger a segfault.

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 329b1a5afaac81d03a14aade79ae1e4bb09d15d2..d2dfff9622da04e7f153fa266ccf312c601ca18e 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1026,7 +1026,7 @@ static int cache_remove_url_filter(ap_filter_t *f, apr_bucket_brigade *in)
 
 static void * create_cache_config(apr_pool_t *p, server_rec *s)
 {
-    const char *tmppath;
+    const char *tmppath = NULL;
     cache_server_conf *ps = apr_pcalloc(p, sizeof(cache_server_conf));
 
     /* array of URL prefixes for which caching is enabled */