File httpd-2.4.6-bnc887771-CVE-2013-4352-mod_cache-crash-r1523235.diff of Package apache2.openSUSE_13.1_Update

diff -rNU 30 ../httpd-2.4.6-o/modules/cache/cache_storage.c ./modules/cache/cache_storage.c
--- ../httpd-2.4.6-o/modules/cache/cache_storage.c	2013-06-26 15:00:03.000000000 +0200
+++ ./modules/cache/cache_storage.c	2014-07-29 18:34:16.000000000 +0200
@@ -686,75 +686,78 @@
     cache_provider_list *list;
     apr_status_t rv, status = DECLINED;
     cache_handle_t *h;
     apr_uri_t location_uri;
     apr_uri_t content_location_uri;
 
     const char *location, *location_key = NULL;
     const char *content_location, *content_location_key = NULL;
 
     if (!cache) {
         /* This should never happen */
         ap_log_rerror(
                 APLOG_MARK, APLOG_ERR, APR_EGENERAL, r, APLOGNO(00697) "cache: No cache request information available for key"
                 " generation");
         return DECLINED;
     }
 
     if (!cache->key) {
         rv = cache_generate_key(r, r->pool, &cache->key);
         if (rv != APR_SUCCESS) {
             return DECLINED;
         }
     }
 
     location = apr_table_get(r->headers_out, "Location");
     if (location) {
         if (APR_SUCCESS != apr_uri_parse(r->pool, location, &location_uri)
                 || 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;
         }
     }
 
     content_location = apr_table_get(r->headers_out, "Content-Location");
     if (content_location) {
         if (APR_SUCCESS
                 != apr_uri_parse(r->pool, content_location,
                         &content_location_uri)
                 || 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;
         }
     }
 
     /* go through the cache types */
     h = apr_palloc(r->pool, sizeof(cache_handle_t));
 
     list = cache->providers;
 
     while (list) {
 
         /* invalidate the request uri */
         rv = list->provider->open_entity(h, r, cache->key);
         if (OK == rv) {
             rv = list->provider->invalidate_entity(h, r);
             status = OK;
         }
         ap_log_rerror(
                 APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(02468) "cache: Attempted to invalidate cached entity with key: %s", cache->key);
 
         /* invalidate the Location */
         if (location_key) {
             rv = list->provider->open_entity(h, r, location_key);
             if (OK == rv) {
                 rv = list->provider->invalidate_entity(h, r);
                 status = OK;
             }
             ap_log_rerror(
                     APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(02469) "cache: Attempted to invalidate cached entity with key: %s", location_key);
         }