From: Jim Jagielski <jim@apache.org>
Date: Thu, 23 May 2013 12:57:38 +0000 (+0000)
Subject: mod_cache: Fix uninitialized tmppath variable. PR 54949
X-Git-Tag: 2.4.5~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e021683cfe9d7192757c9bd1ed8a92c9c6fc1841;p=apache

mod_cache: Fix uninitialized tmppath variable. PR 54949


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

diff --git a/STATUS b/STATUS
index c1070d39a6..7a87c3a81f 100644
--- a/STATUS
+++ b/STATUS
@@ -90,11 +90,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.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-tmppath.patch
-      +1: minfrin, jailletc36, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 46ac09f693..b1bb65abd0 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1774,7 +1774,7 @@ static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) {
 
 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 */