httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r189561 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS modules/mappers/mod_userdir.c
Date Wed, 08 Jun 2005 09:00:26 GMT
Author: jorton
Date: Wed Jun  8 02:00:24 2005
New Revision: 189561

URL: http://svn.apache.org/viewcvs?rev=189561&view=rev
Log:
Merge r165151 from trunk:

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

PR: 34588
Reviewed by: jorton, bnicholes, trawick

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/mappers/mod_userdir.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=189561&r1=189560&r2=189561&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES (original)
+++ httpd/httpd/branches/2.0.x/CHANGES Wed Jun  8 02:00:24 2005
@@ -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]
   

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=189561&r1=189560&r2=189561&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Wed Jun  8 02:00:24 2005
@@ -235,12 +235,6 @@
         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 @@
         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. 

Modified: httpd/httpd/branches/2.0.x/modules/mappers/mod_userdir.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/mappers/mod_userdir.c?rev=189561&r1=189560&r2=189561&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/mappers/mod_userdir.c (original)
+++ httpd/httpd/branches/2.0.x/modules/mappers/mod_userdir.c Wed Jun  8 02:00:24 2005
@@ -330,7 +330,7 @@
         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;
     }
 



Mime
View raw message