httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Wed, 15 Oct 2003 22:55:49 GMT
nd          2003/10/15 15:55:49

  Modified:    .        CHANGES
               modules/filters mod_include.c
  Log:
  fix segfault which occured if the filename was not
  set, for example, when processing some error conditions.
  
  PR: 23836
  
  Revision  Changes    Path
  1.1294    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1293
  retrieving revision 1.1294
  diff -u -u -r1.1293 -r1.1294
  --- CHANGES	14 Oct 2003 03:45:17 -0000	1.1293
  +++ CHANGES	15 Oct 2003 22:55:48 -0000	1.1294
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_include: fix segfault which occured if the filename was not
  +     set, for example, when processing some error conditions.
  +     PR 23836.  [Brian Akins <bakins@web.turner.com>, André Malo]
  +
     *) mod_cgid: fix a hash table corruption problem which could
        result in the wrong script being cleaned up at the end of a
        request.  [Jeff Trawick]
  
  
  
  1.288     +1 -1      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.287
  retrieving revision 1.288
  diff -u -u -r1.287 -r1.288
  --- mod_include.c	12 Sep 2003 23:01:20 -0000	1.287
  +++ mod_include.c	15 Oct 2003 22:55:48 -0000	1.288
  @@ -641,7 +641,7 @@
           apr_table_setn(e, "DOCUMENT_PATH_INFO", r->path_info);
       }
       apr_table_setn(e, "USER_NAME", LAZY_VALUE);
  -    if ((t = strrchr(r->filename, '/'))) {
  +    if (r->filename && (t = strrchr(r->filename, '/'))) {
           apr_table_setn(e, "DOCUMENT_NAME", ++t);
       }
       else {
  
  
  

Mime
View raw message