From e79712095be16db0ec26d4b0d977de6cc9d5fa0c Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Sun, 26 Feb 2017 02:07:14 -0300
Subject: [PATCH] Minor fix in the decision on whenever the log callback should
 be called

---
 headers/modsecurity/rule_message.h | 2 +-
 src/rule.cc                        | 2 +-
 src/rule_message.cc                | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/headers/modsecurity/rule_message.h b/headers/modsecurity/rule_message.h
index 450534d7..1c9968a0 100644
--- a/headers/modsecurity/rule_message.h
+++ b/headers/modsecurity/rule_message.h
@@ -52,7 +52,7 @@ class RuleMessage {
         m_ruleFile(rule->m_fileName),
         m_ruleId(rule->m_ruleId),
         m_ruleLine(rule->m_lineNumber),
-        m_saveMessage(false),
+        m_saveMessage(true),
         m_serverIpAddress(trans->m_serverIpAddress),
         m_severity(0),
         m_uriNoQueryStringDecoded(trans->m_uri_no_query_string_decoded),
diff --git a/src/rule.cc b/src/rule.cc
index 198ceeab..eb4b749a 100644
--- a/src/rule.cc
+++ b/src/rule.cc
@@ -697,7 +697,7 @@ end_clean:
 
 end_exec:
     executeActionsAfterFullMatch(trans, containsDisruptive, ruleMessage);
-    if (this->m_chained == false) {
+    if (this->m_chained == false && ruleMessage->m_saveMessage != false) {
         trans->serverLog(ruleMessage);
         trans->m_rulesMessages.push_back(*ruleMessage);
     }
diff --git a/src/rule_message.cc b/src/rule_message.cc
index 8c1ae7bc..952c0ff4 100644
--- a/src/rule_message.cc
+++ b/src/rule_message.cc
@@ -100,8 +100,7 @@ std::string RuleMessage::errorLog(const RuleMessage *rm) {
 }
 
 std::string RuleMessage::log(const RuleMessage *rm) {
-    std::string msg;
-
+    std::string msg("");
     if (rm->m_isDisruptive) {
         msg.append(disruptiveErrorLog(rm));
     } else {