Commit ee10114e authored by Joe Orton's avatar Joe Orton
Browse files

* modules/filters/mod_include.c (handle_include): Fix possible

variable corruption with nested includes.

PR: 12655


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179763 13f79535-47bb-0310-9956-ffa450edef68
parent d39f0362
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -1699,10 +1699,10 @@ static apr_status_t handle_include(include_ctx_t *ctx, ap_filter_t *f,
            SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
            SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
        }
        }


        /* destroy the sub request */
        /* Do *not* destroy the subrequest here; it may have allocated
        if (rr) {
         * variables in this r->subprocess_env in the subrequest's
            ap_destroy_sub_req(rr);
         * r->pool, so that pool must survive as long as this request.
        }
         * Yes, this is a memory leak. */


        if (error_fmt) {
        if (error_fmt) {
            break;
            break;