diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:26:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:26:16 -0400 |
| commit | 047555214056da24d682d47562a88e53563e49ff (patch) | |
| tree | fcdf1b7cec6e6916a24ab3a7c47db5cf2faae8b0 /src/or/rendcommon.c | |
| parent | 929a8f199bc236c39794f675a7bb8ad00b155257 (diff) | |
| parent | fe69a7e1d7658d3202af0c2c7308d342faaa1559 (diff) | |
| download | tor-047555214056da24d682d47562a88e53563e49ff.tar.gz tor-047555214056da24d682d47562a88e53563e49ff.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'src/or/rendcommon.c')
| -rw-r--r-- | src/or/rendcommon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 866f4fb026..5fdd13efce 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1190,7 +1190,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, |