github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes related to std::shared_ptr usage in RuleWithActions

Browse Source 
- RuleWithActions::evaluate(Transaction *transaction)
  - Removed temporary rm local variable used to immediately create
  std::shared_ptr<RuleMessage>.
- Leverage std::make_shared & auto to simplify code.
This commit is contained in:
Eduardo Arias 2024-04-23 16:22:58 -03:00
parent 10c6ee726f
commit fef419f986
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rule_with_actions.cc
View File

@ -172,9 +172,7 @@ RuleWithActions::~RuleWithActions() {
bool RuleWithActions::evaluate(Transaction *transaction) { bool RuleWithActions::evaluate(Transaction *transaction) {
RuleMessage rm(this, transaction); return evaluate(transaction, std::make_shared<RuleMessage>(this, transaction));
std::shared_ptr<RuleMessage> rm2 = std::make_shared<RuleMessage>(&rm);
return evaluate(transaction, rm2);
} }
@ -330,7 +328,7 @@ inline void RuleWithActions::executeTransformation(
std::string newValue = a->evaluate(*oldValue, trans); std::string newValue = a->evaluate(*oldValue, trans);
if (newValue != *oldValue) { if (newValue != *oldValue) {
std::shared_ptr<std::string> u(new std::string(newValue)); auto u = std::make_shared<std::string>(newValue);
if (m_containsMultiMatchAction) { if (m_containsMultiMatchAction) {
ret->push_back(std::make_pair(u, a->m_name)); ret->push_back(std::make_pair(u, a->m_name));
(*nth)++; (*nth)++;
@ -355,14 +353,13 @@ void RuleWithActions::executeTransformations(
int none = 0; int none = 0;
int transformations = 0; int transformations = 0;
std::string path(""); std::string path("");
std::shared_ptr<std::string> value = auto value = std::make_shared<std::string>(in);
std::shared_ptr<std::string>(new std::string(in));
if (m_containsMultiMatchAction == true) { if (m_containsMultiMatchAction == true) {
/* keep the original value */ /* keep the original value */
ret.push_back(std::make_pair( ret.push_back(std::make_pair(
std::shared_ptr<std::string>(new std::string(*value)), std::make_shared<std::string>(*value),
std::shared_ptr<std::string>(new std::string(path)))); std::make_shared<std::string>(path)));
} }
for (Action *a : m_transformations) { for (Action *a : m_transformations) {
@ -436,8 +433,8 @@ void RuleWithActions::executeTransformations(
if (!m_containsMultiMatchAction) { if (!m_containsMultiMatchAction) {
ret.push_back(std::make_pair( ret.push_back(std::make_pair(
std::shared_ptr<std::string>(new std::string(*value)), std::make_shared<std::string>(*value),
std::shared_ptr<std::string>(new std::string(path)))); std::make_shared<std::string>(path)));
} }
} }