]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Don't call flush_pending_log_callbacks while logging LD_NOCB messages.
authorRobert Ransom <rransom.8774@gmail.com>
Sat, 11 Dec 2010 12:41:35 +0000 (04:41 -0800)
committerRobert Ransom <rransom.8774@gmail.com>
Sat, 11 Dec 2010 12:41:35 +0000 (04:41 -0800)
Found by boboper.

src/common/log.c

index f26c5ef34a1268445469db900cdbe456f9b470f4..f63c3fb9b4241b0f5395c0a47abec000fad512f0 100644 (file)
@@ -280,7 +280,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
   assert(severity >= LOG_ERR && severity <= LOG_DEBUG);
   LOCK_LOGS();
 
-  if (smartlist_len(pending_cb_messages))
+  if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages))
     flush_pending_log_callbacks();
 
   lf = logfiles;