1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00

SECURITY (CVE-2013-4352): Fix a NULL pointer deference which allowed

untrusted origin servers to crash mod_cache in a forward proxy configuration.

mod_cache: Avoid a crash with strcmp() when the hostname is not provided.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1523235 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2013-09-14 13:32:25 +00:00
parent 69637dff7d
commit e62246ac2b
2 changed files with 9 additions and 3 deletions

View File

@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
*) mod_cache: Avoid a crash with strcmp() when the hostname is not provided.
[Graham Leggett]
*) mod_lua: Add rudimentary support for WebSocket interaction. This is
currently request-bound and only supports the WS protocol. [Daniel Gruno]

View File

@@ -713,7 +713,9 @@ int cache_invalidate(cache_request_rec *cache, request_rec *r)
|| APR_SUCCESS
!= cache_canonicalise_key(r, r->pool, location,
&location_uri, &location_key)
|| strcmp(r->parsed_uri.hostname, location_uri.hostname)) {
|| !(r->parsed_uri.hostname && location_uri.hostname
&& !strcmp(r->parsed_uri.hostname,
location_uri.hostname))) {
location_key = NULL;
}
}
@@ -726,8 +728,9 @@ int cache_invalidate(cache_request_rec *cache, request_rec *r)
|| APR_SUCCESS
!= cache_canonicalise_key(r, r->pool, content_location,
&content_location_uri, &content_location_key)
|| strcmp(r->parsed_uri.hostname,
content_location_uri.hostname)) {
|| !(r->parsed_uri.hostname && content_location_uri.hostname
&& !strcmp(r->parsed_uri.hostname,
content_location_uri.hostname))) {
content_location_key = NULL;
}
}