mod_cgid: Fix storage corruption caused by use of incorrect pool.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102961 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 20180618d4969d05898319c061d12691033c711c..bbe156d1f1ff95a6529873583d43e36e2225d699 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_cgid: Fix storage corruption caused by use of incorrect pool.
+     [Jeff Trawick]
+
   *) Satisfy directives now can be influenced by a surrounding <Limit>
      container.  PR 14726.  [André Malo]
 

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index ec337baf8b0eeffa1b2eb91f9fbcef1b04293a23..210eff41e0248cfe7a7f54a223ea93840f1c21a2 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -812,7 +812,7 @@ static int cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
     apr_pool_userdata_get((void **)&procnew, userdata_key, main_server->process->pool);
     if (!procnew) {
         first_time = 1;
-        procnew = apr_pcalloc(p, sizeof(*procnew));
+        procnew = apr_pcalloc(main_server->process->pool, sizeof(*procnew));
         procnew->pid = -1;
         procnew->err = procnew->in = procnew->out = NULL;
         apr_pool_userdata_set((const void *)procnew, userdata_key,