Merge pull request #2886 from martinhsv/v3/master

Add some member variable inits in Transaction class
owasp-modsecurity · Apr 1, 2023 · 49281b6 · 49281b6
2 parents 1feaa7d + db84d8c
commit 49281b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 v3.x.y - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+  - Add some member variable inits in Transaction class
+    [Issue #2886 - @GNU-Plus-Windows-User, @airween, @mdounin, @martinhsv]
   - Resolve memory leak on reload (bison-generated variable)
     [Issue #2876 - @martinhsv]
   - Support equals sign in XPath expressions

diff --git a/src/transaction.cc b/src/transaction.cc
@@ -101,11 +101,11 @@ namespace modsecurity {
  */
 Transaction::Transaction(ModSecurity *ms, RulesSet *rules, void *logCbData)
     : m_creationTimeStamp(utils::cpu_seconds()),
-    /* m_clientIpAddress(nullptr), */
+     m_clientIpAddress(std::make_shared<std::string>("")),
     m_httpVersion(""),
-    /* m_serverIpAddress(""), */
+    m_serverIpAddress(std::make_shared<std::string>("")),
     m_uri(""),
-    /* m_uri_no_query_string_decoded(""), */
+    m_uri_no_query_string_decoded(std::make_shared<std::string>("")),
     m_ARGScombinedSizeDouble(0),
     m_clientPort(0),
     m_highestSeverityAction(255),
@@ -175,11 +175,11 @@ Transaction::Transaction(ModSecurity *ms, RulesSet *rules, void *logCbData)
 
 Transaction::Transaction(ModSecurity *ms, RulesSet *rules, char *id, void *logCbData)
     : m_creationTimeStamp(utils::cpu_seconds()),
-    /* m_clientIpAddress(""), */
+    m_clientIpAddress(std::make_shared<std::string>("")),
     m_httpVersion(""),
-    /* m_serverIpAddress(""), */
+    m_serverIpAddress(std::make_shared<std::string>("")),
     m_uri(""),
-    /* m_uri_no_query_string_decoded(""), */
+    m_uri_no_query_string_decoded(std::make_shared<std::string>("")),
     m_ARGScombinedSizeDouble(0),
     m_clientPort(0),
     m_highestSeverityAction(255),