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

Instantiates the Class variable earlier

Browse Source 
Avoid the instantiation for every call
This commit is contained in:
Felipe Zimmerle 2017-01-18 09:13:34 -03:00 committed by Felipe Zimmerle
parent ba6b972ca8
commit 9a8fc3116a
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
headers/modsecurity/collection/variable.h
View File

@ -33,10 +33,16 @@ namespace collection {
class Variable { class Variable {
public: public:
Variable(const std::string *key) :
m_key(key),
m_value(),
m_dynamic_value(false),
m_dynamic(false) { }
Variable(const std::string *key, const std::string *value) : Variable(const std::string *key, const std::string *value) :
m_key(key), m_key(key),
m_value(value), m_value(value),
m_dynamic_value(false) { } m_dynamic_value(false),
m_dynamic(false) { }
~Variable() { ~Variable() {
if (m_dynamic_value) { if (m_dynamic_value) {
@ -47,6 +53,7 @@ class Variable {
const std::string *m_key; const std::string *m_key;
const std::string *m_value; const std::string *m_value;
bool m_dynamic_value; bool m_dynamic_value;
bool m_dynamic;
}; };
} // namespace collection } // namespace collection

26
src/rule.cc
View File

@ -420,8 +420,10 @@ std::vector<const collection::Variable *> Rule::getFinalVars(
trasn->debug(9, "Variable: " + *key + trasn->debug(9, "Variable: " + *key +
" is part of the exclusion list, skipping..."); " is part of the exclusion list, skipping...");
#endif #endif
delete v; if (v->m_dynamic) {
v = NULL; delete v;
v = NULL;
}
continue; continue;
} }
@ -439,8 +441,10 @@ std::vector<const collection::Variable *> Rule::getFinalVars(
} }
} }
if (ignoreVariable) { if (ignoreVariable) {
delete v; if (v->m_dynamic) {
v = NULL; delete v;
v = NULL;
}
continue; continue;
} }
@ -458,8 +462,10 @@ std::vector<const collection::Variable *> Rule::getFinalVars(
} }
} }
if (ignoreVariable) { if (ignoreVariable) {
delete v; if (v->m_dynamic) {
v = NULL; delete v;
v = NULL;
}
continue; continue;
} }
@ -636,7 +642,9 @@ end_clean:
while (finalVars.empty() == false) { while (finalVars.empty() == false) {
auto *a = finalVars.back(); auto *a = finalVars.back();
finalVars.pop_back(); finalVars.pop_back();
delete a; if (a->m_dynamic) {
delete a;
}
} }
return false; return false;
@ -654,7 +662,9 @@ end_exec:
while (finalVars.empty() == false) { while (finalVars.empty() == false) {
auto *a = finalVars.back(); auto *a = finalVars.back();
finalVars.pop_back(); finalVars.pop_back();
delete a; if (a->m_dynamic) {
delete a;
}
} }
return true; return true;