diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-19 07:58:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-19 07:58:21 -0500 |
| commit | c11de4c45f5611a12fba005032941a40f5ce5f66 (patch) | |
| tree | cddd8d7242cdc4f48ea1f243f0a507249320fe9b /src | |
| parent | e0306320b543049bc66adb19e359b369c66fb775 (diff) | |
| parent | 0fb3058eced5dce355d777288bd9ec255b875db4 (diff) | |
| download | tor-c11de4c45f5611a12fba005032941a40f5ce5f66.tar.gz tor-c11de4c45f5611a12fba005032941a40f5ce5f66.zip | |
Merge branch 'bug21018_024' into maint-0.2.8
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/rendcache.c | 4 | ||||
| -rw-r--r-- | src/or/routerparse.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/or/rendcache.c b/src/or/rendcache.c index f8206cd53b..f9ae6d1173 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -915,7 +915,9 @@ rend_cache_store_v2_desc_as_client(const char *desc, 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."); + "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 91025c1568..4db40c8435 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4122,7 +4122,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; @@ -5171,7 +5171,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); @@ -5203,7 +5203,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 - |