summaryrefslogtreecommitdiff
path: root/src/or/rendcommon.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-06 09:26:28 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-06 09:26:28 -0400
commita201a5396e9aef779386216e2a21bfeb75d3d9c6 (patch)
treeb2543378e963b13857dca542d64739f040413ed9 /src/or/rendcommon.c
parent24352d0d70542d43588a5c5a6da3f63a317d049d (diff)
parent047555214056da24d682d47562a88e53563e49ff (diff)
downloadtor-a201a5396e9aef779386216e2a21bfeb75d3d9c6.tar.gz
tor-a201a5396e9aef779386216e2a21bfeb75d3d9c6.zip
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src/or/rendcommon.c')
-rw-r--r--src/or/rendcommon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 174f1c4b04..5711f9e936 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1189,7 +1189,7 @@ rend_cache_store_v2_desc_as_client(const char *desc,
}
/* Decode/decrypt introduction points. */
- if (intro_content) {
+ if (intro_content && intro_size > 0) {
int n_intro_points;
if (rend_query->auth_type != REND_NO_AUTH &&
!tor_mem_is_zero(rend_query->descriptor_cookie,