summaryrefslogtreecommitdiff
path: root/src/or/rendcommon.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-11-30 23:45:16 +0000
committerRoger Dingledine <arma@torproject.org>2007-11-30 23:45:16 +0000
commitc1b4bfdeac40e49224f64b80890251df7177ce43 (patch)
tree2d4ea1fe55f88d3f0c2109f2e3e675d7ca6a54d4 /src/or/rendcommon.c
parent30e1a862e7dd8b3e16eecaab1f8703ffc789f098 (diff)
downloadtor-c1b4bfdeac40e49224f64b80890251df7177ce43.tar.gz
tor-c1b4bfdeac40e49224f64b80890251df7177ce43.zip
karsten's bugfix on r12607
svn:r12619
Diffstat (limited to 'src/or/rendcommon.c')
-rw-r--r--src/or/rendcommon.c15
1 files changed, 8 insertions, 7 deletions
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;
}