From: Robert Ransom <rransom.8774@gmail.com>
Date: Fri, 12 Nov 2010 11:07:09 +0000 (-0800)
Subject: Disable logging to control port connections in buf_shrink_freelists.
X-Git-Tag: tor-0.2.2.18-alpha~13^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a421e284d068955783fa30d6b7088d605b440ffd;p=thirdparty%2Ftor.git

Disable logging to control port connections in buf_shrink_freelists.

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

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 5b53d12f80..b96b82de5a 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