diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-11-12 13:05:58 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-11-12 13:05:58 -0500 |
commit | dbba84c917279c8c58b1bfdac37fbcdfd84b7bb7 (patch) | |
tree | e30871621df4e8715a12d2234e7cd0337451bbe4 /src | |
parent | 3a7614c670cd31b76df1ddc8872e7050faf61355 (diff) | |
download | tor-dbba84c917279c8c58b1bfdac37fbcdfd84b7bb7.tar tor-dbba84c917279c8c58b1bfdac37fbcdfd84b7bb7.tar.gz |
Avoid perma-blocking the controller on bug in shrink_freelist
In all likelihood, this bug would make Tor assert, but if it doesn't,
let's not have two bugs.
Diffstat (limited to 'src')
-rw-r--r-- | src/or/buffers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 7c28dc1a4..d25ff6433 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -283,7 +283,7 @@ buf_shrink_freelists(int free_all) orig_n_to_skip, (int)freelists[i].alloc_size, orig_n_to_skip-n_to_skip, freelists[i].cur_length); assert_freelist_ok(&freelists[i]); - return; + goto done; } // tor_assert((*chp)->next); chp = &(*chp)->next; @@ -318,6 +318,7 @@ buf_shrink_freelists(int free_all) freelists[i].lowest_length = freelists[i].cur_length; assert_freelist_ok(&freelists[i]); } + done: enable_control_logging(); #else (void) free_all; |