Commit 83962c07 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Fix a segfault in mod_include when the original request has no 

associated filename (e.g., we're filtering the error document for
a bad URI).

Reported by: Joshua Slive


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90486 13f79535-47bb-0310-9956-ffa450edef68
parent f536ffee

CHANGES

+4 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.25-dev



  *) Fix a segfault in mod_include when the original request has no

     associated filename (e.g., we're filtering the error document for

     a bad URI).  [Jeff Trawick]



  *) Fix a storage leak (a strdup() call) in mod_mime_magic.  [Jeff Trawick]



  *) The prefork and OS/2 MPMs are overwriting the pid file when a second copy

modules/filters/mod_include.c

+2 −2
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ static int handle_include(include_ctx_t *ctx, apr_bucket_brigade **bb, request_r 
                    for (p = r; p != NULL && !founddupe; p = p->main) {

    		    request_rec *q;

    		    for (q = p; q != NULL; q = q->prev) {

    			if ( (strcmp(q->filename, rr->filename) == 0) ||

    			if ((q->filename && rr->filename && (strcmp(q->filename, rr->filename) == 0)) ||

                            (strcmp(q->uri, rr->uri) == 0)) {

    			    founddupe = 1;

    			    break;