From: Donncha O'Cearbhaill <donncha@donncha.is>
Date: Mon, 24 Aug 2015 13:17:33 +0000 (+0200)
Subject: Require explict specification of cache type
X-Git-Tag: tor-0.2.8.1-alpha~343^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee1a4ce8b2d927dff5e8feafe8b0363d57a4f32e;p=thirdparty%2Ftor.git

Require explict specification of cache type
---

diff --git a/src/or/rendcache.c b/src/or/rendcache.c
index 7617e9db28..aae37ebbf7 100644
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@ -491,6 +491,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e,
   tor_assert(rend_cache_service);
   tor_assert(rend_cache);
   tor_assert(query);
+  tor_assert(cache);
 
   if (!rend_valid_service_id(query)) {
     ret = -EINVAL;
@@ -506,7 +507,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e,
     default:
       if(cache == REND_CACHE_TYPE_SERVICE){
         entry = strmap_get_lc(rend_cache_service, query);
-      } else {
+      } else if (cache == REND_CACHE_TYPE_CLIENT)  {
         tor_snprintf(key, sizeof(key), "%d%s", default_version, query);
         entry = strmap_get_lc(rend_cache, key);
       }