Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 8233 invoked from network); 15 Oct 2003 22:55:51 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 15 Oct 2003 22:55:51 -0000 Received: (qmail 84265 invoked by uid 500); 15 Oct 2003 22:55:36 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 84243 invoked by uid 500); 15 Oct 2003 22:55:35 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 84229 invoked by uid 500); 15 Oct 2003 22:55:35 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 84224 invoked from network); 15 Oct 2003 22:55:35 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 15 Oct 2003 22:55:35 -0000 Received: (qmail 8222 invoked by uid 1569); 15 Oct 2003 22:55:49 -0000 Date: 15 Oct 2003 22:55:49 -0000 Message-ID: <20031015225549.8221.qmail@minotaur.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/filters mod_include.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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 , 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 {