diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:25:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:25:37 -0400 |
| commit | fe69a7e1d7658d3202af0c2c7308d342faaa1559 (patch) | |
| tree | 9a713f7649647586825075823f456d3d710a4a60 /src/or/rendcommon.c | |
| parent | 3781955f079f25f8d6aa47cb746e339497076050 (diff) | |
| parent | 7451b4cafededa95da0099ea2444224d941eef52 (diff) | |
| download | tor-fe69a7e1d7658d3202af0c2c7308d342faaa1559.tar.gz tor-fe69a7e1d7658d3202af0c2c7308d342faaa1559.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
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 a664b5d501..bd701b217e 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1087,7 +1087,7 @@ rend_cache_store_v2_desc_as_client(const char *desc, goto err; } /* 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, |