github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Using shared_ptr instead of unique_ptr on rules exceptions

Browse Source
This commit is contained in:
Felipe Zimmerle
2018-10-19 23:26:18 -03:00
parent e63344c3dc
commit fa5f3784f2
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/rule.cc
View File

@@ -683,6 +683,9 @@ bool Rule::evaluate(Transaction *trans,
for (auto &var : vars) {
std::vector<const VariableValue *> e;
if (!var) {
continue;
}
var->evaluate(trans, this, &e);
for (const VariableValue *v : e) {
const std::string &value = v->m_value;

26
src/rules_exceptions.cc
View File

@@ -96,7 +96,8 @@ bool RulesExceptions::loadUpdateTargetByTag(const std::string &tag,
m_variable_update_target_by_tag.emplace(
std::pair<std::shared_ptr<std::string>,
std::unique_ptr<Variables::Variable>>(
std::make_shared<std::string>(tag), std::move(i)));
std::make_shared<std::string>(tag),
std::move(i)));
}
return true;
@@ -110,7 +111,8 @@ bool RulesExceptions::loadUpdateTargetById(double id,
for (auto &i : *var) {
m_variable_update_target_by_id.emplace(
std::pair<double,
std::unique_ptr<Variables::Variable>>(id , std::move(i)));
std::unique_ptr<Variables::Variable>>(id,
std::move(i)));
}
return true;
@@ -220,36 +222,36 @@ bool RulesExceptions::merge(RulesExceptions *from) {
for (auto &p : from->m_variable_update_target_by_tag) {
m_variable_update_target_by_tag.emplace(
std::pair<std::shared_ptr<std::string>,
std::unique_ptr<Variables::Variable>>(p.first,
std::move(p.second)));
std::shared_ptr<Variables::Variable>>(p.first,
p.second));
}
for (auto &p : from->m_variable_update_target_by_msg) {
m_variable_update_target_by_msg.emplace(
std::pair<std::shared_ptr<std::string>,
std::unique_ptr<Variables::Variable>>(p.first,
std::move(p.second)));
std::shared_ptr<Variables::Variable>>(p.first,
p.second));
}
for (auto &p : from->m_variable_update_target_by_id) {
m_variable_update_target_by_id.emplace(
std::pair<double,
std::unique_ptr<Variables::Variable>>(p.first,
std::move(p.second)));
std::shared_ptr<Variables::Variable>>(p.first,
p.second));
}
for (auto &p : from->m_action_pos_update_target_by_id) {
m_action_pos_update_target_by_id.emplace(
std::pair<double,
std::unique_ptr<actions::Action>>(p.first,
std::move(p.second)));
std::shared_ptr<actions::Action>>(p.first,
p.second));
}
for (auto &p : from->m_action_pre_update_target_by_id) {
m_action_pre_update_target_by_id.emplace(
std::pair<double,
std::unique_ptr<actions::Action>>(p.first,
std::move(p.second)));
std::shared_ptr<actions::Action>>(p.first,
p.second));
}
for (auto &p : from->m_remove_rule_by_msg) {