diff --git a/src/transaction.cc b/src/transaction.cc index a19ce88b..7dc8ba24 100644 --- a/src/transaction.cc +++ b/src/transaction.cc @@ -1492,9 +1492,8 @@ bool Transaction::intervention(ModSecurityIntervention *it) { it->status = m_it.status; if (m_it.log != NULL) { - std::string log(""); - log.append(m_it.log); - utils::string::replaceAll(&log, std::string("%d"), + std::string log(m_it.log); + utils::string::replaceAll(log, "%d", std::to_string(it->status)); it->log = strdup(log.c_str()); } else { diff --git a/src/utils/string.cc b/src/utils/string.cc index 8d9e08ff..276fd31f 100644 --- a/src/utils/string.cc +++ b/src/utils/string.cc @@ -254,11 +254,11 @@ unsigned char *c2x(unsigned what, unsigned char *where) { } -void replaceAll(std::string *str, const std::string& from, - const std::string& to) { +void replaceAll(std::string &str, std::string_view from, + std::string_view to) { size_t start_pos = 0; - while ((start_pos = str->find(from, start_pos)) != std::string::npos) { - str->replace(start_pos, from.length(), to); + while ((start_pos = str.find(from, start_pos)) != std::string::npos) { + str.replace(start_pos, from.length(), to); start_pos += to.length(); } } diff --git a/src/utils/string.h b/src/utils/string.h index 55ebc0bd..1cd63296 100644 --- a/src/utils/string.h +++ b/src/utils/string.h @@ -68,8 +68,8 @@ std::vector ssplit(std::string str, char delimiter); std::pair ssplit_pair(const std::string& str, char delimiter); std::vector split(std::string str, char delimiter); void chomp(std::string *str); -void replaceAll(std::string *str, const std::string& from, - const std::string& to); +void replaceAll(std::string &str, std::string_view from, + std::string_view to); std::string removeWhiteSpacesIfNeeded(std::string a); std::string parserSanitizer(std::string a);