httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Wed, 22 Aug 2001 12:07:40 GMT
trawick     01/08/22 05:07:40

  Modified:    .        CHANGES
               modules/filters mod_include.c
  Log:
  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
  
  Revision  Changes    Path
  1.321     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.320
  retrieving revision 1.321
  diff -u -r1.320 -r1.321
  --- CHANGES	2001/08/21 12:16:52	1.320
  +++ CHANGES	2001/08/22 12:07:40	1.321
  @@ -1,5 +1,9 @@
   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
  
  
  
  1.126     +2 -2      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- mod_include.c	2001/08/18 17:36:26	1.125
  +++ mod_include.c	2001/08/22 12:07:40	1.126
  @@ -832,8 +832,8 @@
                       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) ||
  -    			     (strcmp(q->uri, rr->uri) == 0) ){
  +    			if ((q->filename && rr->filename && (strcmp(q->filename,
rr->filename) == 0)) ||
  +                            (strcmp(q->uri, rr->uri) == 0)) {
       			    founddupe = 1;
       			    break;
       			}
  
  
  

Mime
View raw message