diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-07 11:09:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-07 11:09:50 -0400 |
| commit | 3f48c7575e7aacc7199722b992d9098a536d05af (patch) | |
| tree | 1b066bb3d1eaba5be11c1876c66207f5f014569f | |
| parent | 120d524fba10fb3bea7caa762e3324e95bc9e529 (diff) | |
| parent | f84f75c59c6b06fbef41f0f0641b604cf3192eeb (diff) | |
| download | tor-3f48c7575e7aacc7199722b992d9098a536d05af.tar tor-3f48c7575e7aacc7199722b992d9098a536d05af.tar.gz | |
Merge branch 'bug5645_take2'
| -rw-r--r-- | changes/bug5645 | 5 | ||||
| -rw-r--r-- | src/or/rendmid.c | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/changes/bug5645 b/changes/bug5645 new file mode 100644 index 000000000..0abd3b1a2 --- /dev/null +++ b/changes/bug5645 @@ -0,0 +1,5 @@ + o Code refactoring: + - Defensively refactor rend_mid_rendezvous() so that protocol + violations and length checks happen in the beginning. Fixes bug + 5645. + diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 2742c351b..894bbb3c5 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -276,13 +276,6 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, or_circuit_t *rend_circ; char hexid[9]; int reason = END_CIRC_REASON_INTERNAL; - base16_encode(hexid,9,(char*)request,request_len<4?request_len:4); - - if (request_len>=4) { - log_info(LD_REND, - "Got request for rendezvous from circuit %d to cookie %s.", - circ->p_circ_id, hexid); - } if (circ->_base.purpose != CIRCUIT_PURPOSE_OR || circ->_base.n_conn) { log_info(LD_REND, @@ -300,6 +293,12 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, goto err; } + base16_encode(hexid, sizeof(hexid), (const char*)request, 4); + + log_info(LD_REND, + "Got request for rendezvous from circuit %d to cookie %s.", + circ->p_circ_id, hexid); + rend_circ = circuit_get_rendezvous((char*)request); if (!rend_circ) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, |