From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 18 Jun 2013 15:54:57 +0000 (-0400)
Subject: Fix some problems with the bug9002 fix.
X-Git-Tag: tor-0.2.4.14-alpha~1^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60d633c73a71d9ba514d4250fe00da5173e9968a;p=thirdparty%2Ftor.git

Fix some problems with the bug9002 fix.

Fixes bug 9090; bug not in any released Tor.
---

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 812fce973d..76786e0fd1 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1081,6 +1081,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published,
              "attempt to improve reliability, but it could also be an "
              "attempt to do a guard enumeration attack. Rejecting.",
              safe_str_client(query));
+    rend_service_descriptor_free(parsed);
     return -2;
   }
   tor_snprintf(key, sizeof(key), "0%s", query);
@@ -1336,6 +1337,8 @@ rend_cache_store_v2_desc_as_client(const char *desc,
                "attempt to improve reliability, but it could also be an "
                "attempt to do a guard enumeration attack. Rejecting.",
                safe_str_client(rend_query->onion_address));
+      retval = -2;
+      goto err;
     }
   } else {
     log_info(LD_REND, "Descriptor does not contain any introduction points.");