diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-08 15:20:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-08 15:20:48 -0500 |
| commit | 9ad083d5731c983ea3e961822306c50ce32dfcc2 (patch) | |
| tree | aa99fb2c0abd436cfd049458a68d913de5988db7 | |
| parent | 95edd51116c17327f314bc132a0a5f86499e410a (diff) | |
| parent | 9a6df215395750286383eed77f3c49d2b3ef34df (diff) | |
| download | tor-9ad083d5731c983ea3e961822306c50ce32dfcc2.tar.gz tor-9ad083d5731c983ea3e961822306c50ce32dfcc2.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | changes/bug2629 | 5 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug2629 b/changes/bug2629 new file mode 100644 index 0000000000..87817cf6e3 --- /dev/null +++ b/changes/bug2629 @@ -0,0 +1,5 @@ + o Minor bugfixes + - Fix a crash bug that could occur occasionally when a client was + configured with a large number of bridges. Fixes bug 2629; bugfix + on 0.2.1.2-alpha. Bugfix by trac user "shitlei". + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b3c9f0e1b5..6be27d29e7 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4728,7 +4728,8 @@ any_pending_bridge_descriptor_fetches(void) conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC && TO_DIR_CONN(conn)->router_purpose == ROUTER_PURPOSE_BRIDGE && !conn->marked_for_close && - conn->linked && !conn->linked_conn->marked_for_close) { + conn->linked && + conn->linked_conn && !conn->linked_conn->marked_for_close) { log_debug(LD_DIR, "found one: %s", conn->address); return 1; } |