[or-cvs] [tor/maint-0.2.1 2/3] Disable logging to control port connections in buf_shrink_freelists.

[nickm at torproject.org]

Author: Robert Ransom <rransom.8774 at gmail.com>
Date: Fri, 12 Nov 2010 03:07:09 -0800
Subject: Disable logging to control port connections in buf_shrink_freelists.
Commit: a421e284d068955783fa30d6b7088d605b440ffd

If buf_shrink_freelists calls log_warn for some reason, we don't want the log
call itself to throw buf_shrink_freelists further off the rails.
---
 src/or/buffers.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 5b53d12..b96b82d 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -251,6 +251,7 @@ buf_shrink_freelists(int free_all)
 {
 #ifdef ENABLE_BUF_FREELISTS
   int i;
+  disable_control_logging();
   for (i = 0; freelists[i].alloc_size; ++i) {
     int slack = freelists[i].slack;
     assert_freelist_ok(&freelists[i]);
@@ -296,6 +297,7 @@ buf_shrink_freelists(int free_all)
     freelists[i].lowest_length = freelists[i].cur_length;
     assert_freelist_ok(&freelists[i]);
   }
+  enable_control_logging();
 #else
   (void) free_all;
 #endif
-- 
1.7.1