]> 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 08:46:26 +0000 (00:46 -0800)
committerRobert Ransom <rransom.8774@gmail.com>
Fri, 12 Nov 2010 10:34:58 +0000 (02:34 -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 e835c615ef7ce3f8d3f0f0572d941400ebd02cc8..7c28dc1a472f0e08e495973a35fb62503fd032cc 100644 (file)
@@ -262,6 +262,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]);
@@ -317,6 +318,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