diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-01-09 00:37:13 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-01-09 00:37:13 +0000 |
| commit | c85ff4d6abe4a1790e8248ca92abf811c7c9803e (patch) | |
| tree | dd6ab5025a21574c2ccb3b7b4506db07f970d36d | |
| parent | 074a314253be640185533ff8e07e965ccec53912 (diff) | |
| download | tor-c85ff4d6abe4a1790e8248ca92abf811c7c9803e.tar.gz tor-c85ff4d6abe4a1790e8248ca92abf811c7c9803e.zip | |
Fix an assert error introduced in 0.1.2.5-alpha: if you're an
advertised exit node, somebody might try to exit from you when
you're bootstrapping and before you've built your descriptor yet.
svn:r9305
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/or/router.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -30,6 +30,11 @@ Changes in version 0.1.2.6-alpha - 2007-??-?? - Authorities do not recommend exits as guards if this would shift excess load to the exit nodes. + o Major bugfixes: + - Fix an assert error introduced in 0.1.2.5-alpha: if you're an + advertised exit node, somebody might try to exit from you when + you're bootstrapping and before you've built your descriptor yet. + o Minor bugfixes: - Restore a warning message if we accidentally resolve an address that we weren't planning to resolve. diff --git a/src/or/router.c b/src/or/router.c index b9b5151b91..35f1225834 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -701,7 +701,8 @@ router_upload_dir_desc_to_dirservers(int force) int router_compare_to_my_exit_policy(edge_connection_t *conn) { - tor_assert(desc_routerinfo); + if (!router_get_my_routerinfo()) /* make sure desc_routerinfo exists */ + return -1; /* make sure it's resolved to something. this way we can't get a 'maybe' below. */ |