From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 6 Jul 2015 19:07:28 +0000 (+0100)
Subject: Fix mutex locking for logger.
X-Git-Tag: 1.0.0~439
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c60a81d93b042890c86298dc6274a375dca3271a;p=thirdparty%2Frspamd.git

Fix mutex locking for logger.
---

diff --git a/src/libutil/logger.c b/src/libutil/logger.c
index a340ea8834..cdbbc0154b 100644
--- a/src/libutil/logger.c
+++ b/src/libutil/logger.c
@@ -385,7 +385,7 @@ rspamd_common_logv (rspamd_logger_t *rspamd_log,
 	const gchar *fmt,
 	va_list args)
 {
-	static gchar logbuf[RSPAMD_LOGBUF_SIZE];
+	gchar logbuf[RSPAMD_LOGBUF_SIZE];
 	u_char *end;
 
 	if (rspamd_log == NULL) {
@@ -402,10 +402,10 @@ rspamd_common_logv (rspamd_logger_t *rspamd_log,
 		}
 	}
 	else if (log_level <= rspamd_log->cfg->log_level) {
-		rspamd_mempool_lock_mutex (rspamd_log->mtx);
 		end = rspamd_vsnprintf (logbuf, sizeof (logbuf), fmt, args);
 		*end = '\0';
 		rspamd_escape_log_string (logbuf);
+		rspamd_mempool_lock_mutex (rspamd_log->mtx);
 		rspamd_log->log_func (NULL,
 			function,
 			log_level,