From: teor (Tim Wilson-Brown) <teor2345@gmail.com>
Date: Fri, 5 Feb 2016 03:14:17 +0000 (+1100)
Subject: Avoid calling log functions in logv when SMARTLIST_DEBUG is defined
X-Git-Tag: tor-0.2.8.2-alpha~121^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=add8acf42882a13af610ace6005d52544509a823;p=thirdparty%2Ftor.git

Avoid calling log functions in logv when SMARTLIST_DEBUG is defined
---

diff --git a/src/common/log.c b/src/common/log.c
index f71583fd63..4779751543 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -490,7 +490,8 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname,
   assert(log_mutex_initialized);
   LOCK_LOGS();
 
-  if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages))
+  if ((! (domain & LD_NOCB)) && pending_cb_messages
+      && smartlist_len(pending_cb_messages))
     flush_pending_log_callbacks();
 
   if (queue_startup_messages &&
@@ -945,7 +946,7 @@ flush_pending_log_callbacks(void)
   smartlist_t *messages, *messages_tmp;
 
   LOCK_LOGS();
-  if (0 == smartlist_len(pending_cb_messages)) {
+  if (!pending_cb_messages || 0 == smartlist_len(pending_cb_messages)) {
     UNLOCK_LOGS();
     return;
   }