From: Martin Kraemer <martin@apache.org>
Date: Mon, 30 Sep 2002 11:17:40 +0000 (+0000)
Subject: Make sure that we indeed had a '/' in the pattern.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c536fdae04ccedfe4f09e24402267fc43e0fa6f;p=thirdparty%2Fapache%2Fhttpd.git

Make sure that we indeed had a '/' in the pattern.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@97028 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/main/http_config.c b/src/main/http_config.c
index b6bbda456b6..f97ff5b3387 100644
--- a/src/main/http_config.c
+++ b/src/main/http_config.c
@@ -1244,8 +1244,7 @@ CORE_EXPORT(void) ap_process_resource_config(server_rec *s, char *fname, pool *p
 	char *path = ap_pstrdup(p,fname);
 	char *pattern = NULL;
 
-        if(ispatt) {
-	    pattern = strrchr(path, '/');
+        if(ispatt && (pattern = strrchr(path, '/')) != NULL) {
             *pattern++ = '\0';
             if (ap_is_fnmatch(path)) {
                 fprintf(stderr, "%s: wildcard patterns not allowed in Include "
@@ -1263,7 +1262,6 @@ CORE_EXPORT(void) ap_process_resource_config(server_rec *s, char *fname, pool *p
                         "for Include %s\n", ap_server_argv0, fname);
                 exit(1);
             }
-
         }