github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-16 08:27:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Variables resolution results now stored into a std::vector instead of std::list

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-11-04 15:51:22 -03:00
parent 2ee5d4ca8f
commit 5bef19aa4d
40 changed files with 143 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/variables/variable.cc
View File

@@ -73,11 +73,15 @@ Variable::Variable(std::string name, VariableKind kind)
}
std::list<transaction::Variable *> *
std::vector<const transaction::Variable *> *
Variable::evaluate(Assay *assay) {
std::list<transaction::Variable *> *l =
new std::list<transaction::Variable *>();
std::vector<const transaction::Variable *> *l = new std::vector<const transaction::Variable *>();
evaluate(assay, l);
return l;
}
void Variable::evaluateInternal(Assay *assay, std::vector<const transaction::Variable *> *l) {
if (m_collectionName.empty() == false) {
if (m_kind == CollectionVarible && m_type == MultipleMatches) {
assay->m_collections.resolveMultiMatches(m_name, m_collectionName, l);
@@ -95,8 +99,11 @@ std::list<transaction::Variable *> *
assay->m_collections.resolveSingleMatch(m_name, l);
}
}
}
return l;
void Variable::evaluate(Assay *assay, std::vector<const transaction::Variable *> *l) {
evaluateInternal(assay, l);
}