From: Jeff Trawick <trawick@apache.org>
Date: Tue, 16 Mar 2004 21:10:16 +0000 (+0000)
Subject: mod_cgid: Fix storage corruption caused by use of incorrect pool.
X-Git-Tag: 2.0.49~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=361eb30aca2c5a8b6cb101ad5b08a3b88a7c002e;p=thirdparty%2Fapache%2Fhttpd.git

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

Reviewed by:	stoddard, bnicholes


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

diff --git a/CHANGES b/CHANGES
index 0c046ec80cb..91c64bf7eb2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) mod_cgid: Fix storage corruption caused by use of incorrect pool.
+     [Jeff Trawick]
+
   *) Win32: find_read_listeners was not correctly handling multiple
      listeners on the Win32DisableAcceptEx path.  [Bill Stoddard]
 
diff --git a/STATUS b/STATUS
index 76f90d0cefb..564fa910389 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/16 20:19:43 $]
+Last modified at [$Date: 2004/03/16 21:10:15 $]
 
 Release:
 
@@ -75,10 +75,6 @@ PATCHES TO BACKPORT FROM 2.1
         support/ab.c: r1.138
       +1: jjclar, bnicholes
 
-    *) mod_cgid: Fix storage corruption caused by use of incorrect pool.
-         modules/generators/mod_cgid.c: r1.425
-       +1: trawick, stoddard, bnicholes
-
     *) Use apr_temp_dir_get for htpasswd
        support/htpasswd.c: 1.75
        +1: thommay
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 810040c6bc2..8d6ec7f4c82 100644
--- 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,