Return-Path: 
 <dev-return-39544-apmail-httpd-dev-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-dev-archive@www.apache.org
Received: (qmail 33345 invoked from network); 23 Oct 2003 20:15:44 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 23 Oct 2003 20:15:44 -0000
Received: (qmail 20697 invoked by uid 500); 23 Oct 2003 20:15:06 -0000
Delivered-To: apmail-httpd-dev-archive@httpd.apache.org
Received: (qmail 20649 invoked by uid 500); 23 Oct 2003 20:15:06 -0000
Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:dev-help@httpd.apache.org>
list-unsubscribe: <mailto:dev-unsubscribe@httpd.apache.org>
list-post: <mailto:dev@httpd.apache.org>
Delivered-To: mailing list dev@httpd.apache.org
Received: (qmail 20560 invoked from network); 23 Oct 2003 20:15:05 -0000
Received: from unknown (HELO jupiter.hal-nine-zero-zero-zero.net)
 (217.160.171.50)
  by daedalus.apache.org with SMTP; 23 Oct 2003 20:15:05 -0000
Received: (qmail 20969 invoked from network); 23 Oct 2003 20:15:13 -0000
Received: from unknown (HELO news.perlig.de) (80.131.134.69)
  by jupiter.hal-nine-zero-zero-zero.net with SMTP; 23 Oct 2003 20:15:13 -0000
Date: Thu, 23 Oct 2003 22:16:57 +0200
From: =?ISO-8859-15?Q?Andr=E9?= Malo <nd@perlig.de>
To: dev@httpd.apache.org
Subject: Re: cvs commit: httpd-2.0/modules/filters mod_include.c
Message-Id: <20031023221657.4f8e4e25.nd@perlig.de>
In-Reply-To: <20031023200746.29898.qmail@minotaur.apache.org>
References: <20031023200746.29898.qmail@minotaur.apache.org>
Organization: TIMTOWTDI
X-Mailer: Sylpheed version 0.9.0claws (GTK+ 1.2.10; i686-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
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@apache.org wrote:

>   Log:
>   fix segfault which occured if the filename was not
>   set, for example, when processing some error conditions.

>   -    if ((t = strrchr(r->filename, '/'))) {
>   +    if (r->filename && (t = strrchr(r->filename, '/'))) {
>            apr_table_setn(e, "DOCUMENT_NAME", ++t);
>        }

In fact, r->filename is used way more often within the includes filter (in
error messages). Should we catch these cases as well, i.e. replace occurences
of r->filename with r->filename ? r->filename : "<NULL>"?

nd