backport r9918:

- Fix a memory leak when we ask for "all" networkstatuses and we
  get one we don't recognize.


svn:r10014
This commit is contained in:
Roger Dingledine 2007-04-24 05:04:21 +00:00
parent 4007d93d94
commit 1fa6c65abe
2 changed files with 11 additions and 3 deletions

View File

@ -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.

View File

@ -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.",