From: Jeff Trawick <trawick@apache.org>
Date: Mon, 30 Jan 2006 14:54:22 +0000 (+0000)
Subject: mod_speling: Stop crashing with certain non-file requests.
X-Git-Tag: 2.3.0~2568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f6733a594ae0116464782e4917ee259c3c4fbb4;p=thirdparty%2Fapache%2Fhttpd.git

mod_speling: Stop crashing with certain non-file requests.

(r->filename unset)


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

diff --git a/CHANGES b/CHANGES
index 1f7b0eaa558..d8e7575f84d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_speling: Stop crashing with certain non-file requests.  [Jeff Trawick]
+
   *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
      PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>, Ruediger Pluem]
 
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index a7b9b9ff169..2c427df254e 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -213,7 +213,12 @@ static int check_speling(request_rec *r)
     }
 
     /* We've already got a file of some kind or another */
-    if (r->proxyreq || (r->finfo.filetype != 0)) {
+    if (r->finfo.filetype != 0) {
+        return DECLINED;
+    }
+
+    /* Not a file request */
+    if (r->proxyreq || !r->filename) {
         return DECLINED;
     }