From 6c6f81abce5d5f067ce9306f7e9c16b0749ba724 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 26 Oct 2015 10:06:20 +0200
Subject: [PATCH] Fix to MXS-427: https://mariadb.atlassian.net/browse/MXS-427
 Stack allocated buffers now have a maximum size.

---
 log_manager/log_manager.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 362d1e69a..6bb326258 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -1609,14 +1609,18 @@ int skygw_log_write_context(logfile_id_t id,
 
     if (len >= 0)
     {
+        if(len > MAX_LOGSTRLEN)
+        {
+            len = MAX_LOGSTRLEN;
+        }
+
         char message[len + 1];
 
         va_start(valist, str);
-        int len2 = vsnprintf(message, sizeof(message), str, valist);
+        vsnprintf(message, sizeof(message), str, valist);
         va_end(valist);
-        assert(len2 == len);
 
-        err = log_write(id, file, line, function, len2, message, LOG_FLUSH_NO);
+        err = log_write(id, file, line, function, len, message, LOG_FLUSH_NO);
 
         if (err != 0)
         {