Removed unused overload of dash_if_empty that sonarcloud flags as pot…

…ential buffer overflow
owasp-modsecurity · Aug 9, 2024 · b77fe4e · b77fe4e
1 parent 8b17f36
commit b77fe4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/transaction.cc b/src/transaction.cc
@@ -1520,7 +1520,7 @@ std::string Transaction::toOldAuditLogFormatIndex(const std::string &filename,
     ss << utils::string::dash_if_empty(
        m_variableRequestHeaders.resolveFirst("Host").get())
         << " ";
-    ss << utils::string::dash_if_empty(this->m_clientIpAddress->c_str()) << " ";
+    ss << utils::string::dash_if_empty(&this->m_clientIpAddress) << " ";
     /** TODO: Check variable */
     variables::RemoteUser *r = new variables::RemoteUser("REMOTE_USER");
     std::vector<const VariableValue *> l;
@@ -1531,7 +1531,7 @@ std::string Transaction::toOldAuditLogFormatIndex(const std::string &filename,
     delete r;
 
     ss << utils::string::dash_if_empty(
-        m_variableRemoteUser.c_str());
+        &m_variableRemoteUser);
     ss << " ";
     /** TODO: Check variable */
     //ss << utils::string::dash_if_empty(

diff --git a/src/utils/string.h b/src/utils/string.h
@@ -75,15 +75,6 @@ inline std::string dash_if_empty(const std::string *str) {
 }
 
 
-inline std::string dash_if_empty(const char *str) {
-    if (str == NULL || std::strlen(str) == 0) {
-        return "-";
-    }
-
-    return std::string(str);
-}
-
-
 inline std::string limitTo(int amount, const std::string &str) {
     std::string ret;