nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a segfault caused by a weird logic error and masked by another.

Browse Source 
svn:r820
This commit is contained in:
Nick Mathewson 2003-11-17 01:20:35 +00:00
parent 4aede010b9
commit 53ab335787
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection_edge.c
View File

@ -772,6 +772,10 @@ int connection_ap_can_use_exit(connection_t *conn, routerinfo_t *exit)
{ {
uint32_t addr; uint32_t addr;
assert(conn);
assert(conn->type == CONN_TYPE_AP);
assert(conn->socks_request);
addr = client_dns_lookup_entry(conn->socks_request->address); addr = client_dns_lookup_entry(conn->socks_request->address);
return router_supports_exit_address(addr, conn->port, exit); return router_supports_exit_address(addr, conn->port, exit);
} }

8
src/or/onion.c
View File

@ -245,10 +245,10 @@ static routerinfo_t *choose_good_exit_server(directory_t *dir)
n_maybe_supported = tor_malloc(sizeof(int)*dir->n_routers); n_maybe_supported = tor_malloc(sizeof(int)*dir->n_routers);
for (i = 0; i < dir->n_routers; ++i) { for (i = 0; i < dir->n_routers; ++i) {
n_supported[i] = n_maybe_supported[i] = 0; n_supported[i] = n_maybe_supported[i] = 0;
for (j = 0; j < n_pending_connections; ++j) { for (j = 0; j < n_connections; ++j) {
if (carray[i]->type != CONN_TYPE_AP || if (carray[j]->type != CONN_TYPE_AP ||
carray[i]->state == AP_CONN_STATE_CIRCUIT_WAIT || carray[j]->state == AP_CONN_STATE_CIRCUIT_WAIT ||
carray[i]->marked_for_close) carray[j]->marked_for_close)
continue; continue;
switch (connection_ap_can_use_exit(carray[j], dir->routers[i])) switch (connection_ap_can_use_exit(carray[j], dir->routers[i]))
{ {