From: Joe Orton <jorton@apache.org>
Date: Wed, 8 Jun 2005 09:00:24 +0000 (+0000)
Subject: Merge r165151 from trunk:
X-Git-Tag: 2.0.55~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=238909520c95e1aa45330aa706ba808fe694e8f6;p=thirdparty%2Fapache%2Fhttpd.git

Merge r165151 from trunk:

* modules/mappers/mod_userdir.c (get_suexec_id_doer): Fix allocation
size.

PR: 34588
Reviewed by: jorton, bnicholes, trawick


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

diff --git a/CHANGES b/CHANGES
index 304477f0e03..384dbbe6dd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.55
-  
+
+  *) mod_userdir: Fix possible memory corruption issue.  PR 34588.
+     [David Leonard <dleonard vintela.com>]
+
   *) worker mpm: don't take down the whole server for a transient
      thread creation failure. PR 34514 [Greg Ames]
   
diff --git a/STATUS b/STATUS
index be1b72a4a76..c0635397885 100644
--- a/STATUS
+++ b/STATUS
@@ -235,12 +235,6 @@ PATCHES TO BACKPORT FROM TRUNK:
         PR: 34452
         +1: jorton
 
-     *) mod_userdir: fix to palloc(sizeof struct) not palloc(sizeof pointer)
-        http://svn.apache.org/viewcvs?rev=165151&view=rev
-        PR: 34588
-        +1: jorton, bnicholes, trawick (isn't it worth a CHANGES entry for a storage
-            corruption fix?)
-
      *) fix z/OS annoyance with pathname on debug messages in error log
         http://svn.apache.org/viewcvs?rev=178299&view=rev
         +1: trawick
@@ -267,7 +261,7 @@ PATCHES TO BACKPORT FROM TRUNK:
         to getting a directory listing when a file was requested.  PR 34512.
         2.1 patch was http://svn.apache.org/viewcvs?rev=179704&view=rev
         2.0 version: http://people.apache.org/~trawick/179704-20.txt
-        +1: trawick
+        +1: trawick, jorton
 
      *) mod_mime_magic: Handle CRLF-format magic files so that it works with
         the default installation on Windows. 
diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index 834c25a2c8b..c5ae63b8ee8 100644
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -330,7 +330,7 @@ static ap_unix_identity_t *get_suexec_id_doer(const request_rec *r)
         return NULL;
     }
 
-    if ((ugid = apr_palloc(r->pool, sizeof(ap_unix_identity_t *))) == NULL) {
+    if ((ugid = apr_palloc(r->pool, sizeof(*ugid))) == NULL) {
         return NULL;
     }