From: Roger Dingledine <arma@torproject.org>
Date: Fri, 30 Nov 2007 23:45:16 +0000 (+0000)
Subject: karsten's bugfix on r12607
X-Git-Tag: tor-0.2.0.13-alpha~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1b4bfdeac40e49224f64b80890251df7177ce43;p=thirdparty%2Ftor.git

karsten's bugfix on r12607


svn:r12619
---

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index a52b916d92..151ed1b23a 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1076,13 +1076,14 @@ rend_cache_store_v2_desc_as_client(const char *desc,
     return -1;
   }
   /* Decode/decrypt introduction points. */
-  if (intro_content &&
-      rend_decrypt_introduction_points(parsed, descriptor_cookie,
-                                       intro_content, intro_size) < 0) {
-    log_warn(LD_PROTOCOL,"Couldn't decode/decrypt introduction points.");
-    rend_service_descriptor_free(parsed);
-    tor_free(intro_content);
-    return -1;
+  if (intro_content) {
+    if (rend_decrypt_introduction_points(parsed, descriptor_cookie,
+                                         intro_content, intro_size) < 0) {
+      log_warn(LD_PROTOCOL,"Couldn't decode/decrypt introduction points.");
+      rend_service_descriptor_free(parsed);
+      tor_free(intro_content);
+      return -1;
+    }
   } else {
     parsed->n_intro_points = 0;
   }