torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Browse Source 
Conflicts:
	src/or/routerparse.c
This commit is contained in:
Nick Mathewson
2011-01-03 11:58:59 -05:00
parent 30b3475e6d 989db9aed1
commit 66039d9843
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/command.c
+2 -1
View File
@@ -600,7 +600,8 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
/* Consider all the other addresses; if any matches, this connection is
* "canonical." */
tor_addr_t addr;
const uint8_t *next = decode_address_from_payload(&addr, cp, (int)(end-cp));
const uint8_t *next =
decode_address_from_payload(&addr, cp, (int)(end-cp));
if (next == NULL) {
log_fn(LOG_PROTOCOL_WARN, LD_OR,
"Bad address in netinfo cell; closing connection.");