httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r179763 - /httpd/httpd/trunk/modules/filters/mod_include.c
Date Fri, 03 Jun 2005 10:12:53 GMT
Author: jorton
Date: Fri Jun  3 03:12:50 2005
New Revision: 179763

URL: http://svn.apache.org/viewcvs?rev=179763&view=rev
Log:
* modules/filters/mod_include.c (handle_include): Fix possible
variable corruption with nested includes.

PR: 12655

Modified:
    httpd/httpd/trunk/modules/filters/mod_include.c

Modified: httpd/httpd/trunk/modules/filters/mod_include.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/filters/mod_include.c?rev=179763&r1=179762&r2=179763&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_include.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_include.c Fri Jun  3 03:12:50 2005
@@ -1699,10 +1699,10 @@
             SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
         }
 
-        /* destroy the sub request */
-        if (rr) {
-            ap_destroy_sub_req(rr);
-        }
+        /* Do *not* destroy the subrequest here; it may have allocated
+         * variables in this r->subprocess_env in the subrequest's
+         * r->pool, so that pool must survive as long as this request.
+         * Yes, this is a memory leak. */
 
         if (error_fmt) {
             break;



Mime
View raw message