]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Disable logging to control port connections in buf_shrink_freelists.
authorRobert Ransom <rransom.8774@gmail.com>
Fri, 12 Nov 2010 11:07:09 +0000 (03:07 -0800)
committerRobert Ransom <rransom.8774@gmail.com>
Fri, 12 Nov 2010 11:07:09 +0000 (03:07 -0800)
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

index 5b53d12f80b303dcf7b8ce69aad730d5858b950a..b96b82de5a856857f9c0ce4db4bebaa36ab9ef09 100644 (file)
@@ -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