diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-20 18:11:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-20 18:11:08 -0500 |
| commit | db58d4d16ff156b8827198b2732646c73eb59f14 (patch) | |
| tree | 0fd918e7660790b133352985366bce71b007cb20 /src/or | |
| parent | 3d2d3f2b62a361552f893b85e5b0d356be0a9261 (diff) | |
| parent | 0fb3058eced5dce355d777288bd9ec255b875db4 (diff) | |
| download | tor-db58d4d16ff156b8827198b2732646c73eb59f14.tar.gz tor-db58d4d16ff156b8827198b2732646c73eb59f14.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/rendcommon.c | 6 | ||||
| -rw-r--r-- | src/or/routerparse.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index bd701b217e..9637d4d838 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1113,8 +1113,10 @@ rend_cache_store_v2_desc_as_client(const char *desc, intro_size); if (n_intro_points <= 0) { log_warn(LD_REND, "Failed to parse introduction points. Either the " - "service has published a corrupt descriptor or you have " - "provided invalid authorization data."); + "service has published a corrupt descriptor, or you have " + "provided invalid authorization data, or (maybe!) the " + "server is deliberately serving broken data in an attempt " + "to crash you with bug 21018."); goto err; } else if (n_intro_points > MAX_INTRO_POINTS) { log_warn(LD_REND, "Found too many introduction points on a hidden " diff --git a/src/or/routerparse.c b/src/or/routerparse.c index b59b0ad4f2..5b70142a43 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3613,7 +3613,7 @@ get_next_token(memarea_t *area, if (tok->tp == ERR_) { /* No keyword matched; call it an "K_opt" or "A_unrecognized" */ - if (**s == '@') + if (*s < eol && **s == '@') tok->tp = A_UNKNOWN_; else tok->tp = K_OPT; @@ -4619,7 +4619,7 @@ rend_decrypt_introduction_points(char **ipos_decrypted, crypto_cipher_free(cipher); len = ipos_encrypted_size - 2 - client_entries_len - CIPHER_IV_LEN; - dec = tor_malloc(len); + dec = tor_malloc_zero(len + 1); declen = crypto_cipher_decrypt_with_iv(session_key, dec, len, ipos_encrypted + 2 + client_entries_len, ipos_encrypted_size - 2 - client_entries_len); @@ -4651,7 +4651,7 @@ rend_decrypt_introduction_points(char **ipos_decrypted, "small."); return -1; } - dec = tor_malloc_zero(ipos_encrypted_size - CIPHER_IV_LEN - 1); + dec = tor_malloc_zero(ipos_encrypted_size - CIPHER_IV_LEN - 1 + 1); declen = crypto_cipher_decrypt_with_iv(descriptor_cookie, dec, ipos_encrypted_size - |