diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-04-24 05:04:21 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-04-24 05:04:21 +0000 |
| commit | 1fa6c65abe98ec600e447ca39be5211b307e5d67 (patch) | |
| tree | bb511dcdfe356899cf14f5fe0c82154b0d262257 | |
| parent | 4007d93d94dadb8f0b509d513d6dc5e9e5376fd7 (diff) | |
| download | tor-1fa6c65abe98ec600e447ca39be5211b307e5d67.tar.gz tor-1fa6c65abe98ec600e447ca39be5211b307e5d67.zip | |
backport r9918:
- Fix a memory leak when we ask for "all" networkstatuses and we
get one we don't recognize.
svn:r10014
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/or/routerlist.c | 4 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Changes in version 0.1.2.13 - 2007-04-24 + o Minor fixes: + - Fix a memory leak when we ask for "all" networkstatuses and we + get one we don't recognize. + - Add more asserts to hunt down bug 417. + - Disable kqueue on OS X 10.3 and earlier, to fix bug 371. + + Changes in version 0.1.2.12-rc - 2007-03-16 o Major bugfixes: - Fix an infinite loop introduced in 0.1.2.7-alpha when we serve @@ -410,7 +418,7 @@ Changes in version 0.1.2.5-alpha - 2007-01-06 o Minor features (directory): - Authorities now specify server versions in networkstatus. This adds - about 2% to the side of compressed networkstatus docs, and allows + about 2% to the size of compressed networkstatus docs, and allows clients to tell which servers support BEGIN_DIR and which don't. The implementation is forward-compatible with a proposed future protocol version scheme not tied to Tor versions. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1ae5389a52..0e496e3d78 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2490,9 +2490,9 @@ router_set_networkstatus(const char *s, time_t arrived_at, if (smartlist_string_isin(requested_fingerprints, fp)) { smartlist_string_remove(requested_fingerprints, fp); } else { - char *requested = - smartlist_join_strings(requested_fingerprints," ",0,NULL); if (source != NS_FROM_DIR_ALL) { + char *requested = + smartlist_join_strings(requested_fingerprints," ",0,NULL); log_warn(LD_DIR, "We received a network status with a fingerprint (%s) that we " "never requested. (We asked for: %s.) Dropping.", |