Avoid segfault if url->hostname is NULL and filter->hostname is "*" or ".".

Stefan Fritsch · Stefan Fritsch · commit 25c3f9a76b77 · 2011-12-18T17:38:24.000Z
Found by clang. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220467 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
@@ -72,17 +72,21 @@ static int uri_meets_conditions(const apr_uri_t *filter, const int pathlen,
                 const size_t fhostlen = strlen(filter->hostname);
                 const size_t uhostlen = url->hostname ? strlen(url->hostname) : 0;
 
-                if (fhostlen > uhostlen || strcasecmp(filter->hostname,
-                        url->hostname + uhostlen - fhostlen)) {
+                if (fhostlen > uhostlen
+                    || (url->hostname
+                        && strcasecmp(filter->hostname,
+                                      url->hostname + uhostlen - fhostlen))) {
                     return 0;
                 }
             }
             else if (filter->hostname[0] == '*') {
                 const size_t fhostlen = strlen(filter->hostname + 1);
                 const size_t uhostlen = url->hostname ? strlen(url->hostname) : 0;
 
-                if (fhostlen > uhostlen || strcasecmp(filter->hostname + 1,
-                        url->hostname + uhostlen - fhostlen)) {
+                if (fhostlen > uhostlen
+                    || (url->hostname
+                        && strcasecmp(filter->hostname + 1,
+                                      url->hostname + uhostlen - fhostlen))) {
                     return 0;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -72,17 +72,21 @@ static int uri_meets_conditions(const apr_uri_t *filter, const int pathlen,`
`72`	`72`	`const size_t fhostlen = strlen(filter->hostname);`
`73`	`73`	`const size_t uhostlen = url->hostname ? strlen(url->hostname) : 0;`
`74`	`74`
`75`		`- if (fhostlen > uhostlen \|\| strcasecmp(filter->hostname,`
`76`		`- url->hostname + uhostlen - fhostlen)) {`
	`75`	`+ if (fhostlen > uhostlen`
	`76`	`+ \|\| (url->hostname`
	`77`	`+ && strcasecmp(filter->hostname,`
	`78`	`+ url->hostname + uhostlen - fhostlen))) {`
`77`	`79`	`return 0;`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`	`else if (filter->hostname[0] == '*') {`
`81`	`83`	`const size_t fhostlen = strlen(filter->hostname + 1);`
`82`	`84`	`const size_t uhostlen = url->hostname ? strlen(url->hostname) : 0;`
`83`	`85`
`84`		`- if (fhostlen > uhostlen \|\| strcasecmp(filter->hostname + 1,`
`85`		`- url->hostname + uhostlen - fhostlen)) {`
	`86`	`+ if (fhostlen > uhostlen`
	`87`	`+ \|\| (url->hostname`
	`88`	`+ && strcasecmp(filter->hostname + 1,`
	`89`	`+ url->hostname + uhostlen - fhostlen))) {`
`86`	`90`	`return 0;`
`87`	`91`	`}`
`88`	`92`	`}`