commit 0b9d52bc7c33aa722cca219882832bc4d2ed44a6 Author: Damian Johnson atagar@torproject.org Date: Sat Sep 24 16:43:47 2011 -0700

fix: fetching relay address could ignored default

The getRelayAddress function would ignore its default argument if tor is shut down, causing it to return None and make arm crash. This is probably a timing issue which is why it went undiscovered so long. --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/util/torTools.py b/src/util/torTools.py index 3d18fcb..9f06a61 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1546,7 +1546,7 @@ class Controller(TorCtl.PostEventListener):

self.connLock.acquire()

- result = None + result = default if self.isAlive(): # query the address if it isn't yet cached if not relayFingerprint in self._addressLookupCache: