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

Fix memory issues while resolving variables

Browse Source
This commit is contained in:
Felipe Zimmerle
2017-08-27 19:00:30 -03:00
parent 003a8e8e5f
commit 7ac6bf7241
10 changed files with 116 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headers/modsecurity/anchored_variable.h
View File

@@ -58,10 +58,12 @@ class AnchoredVariable {
std::unique_ptr<std::string> resolveFirst();
Transaction *m_transaction;
collection::Variable *m_var;
int m_offset;
std::string m_name;
std::string m_value;
private:
collection::Variable *m_var;
};
} // namespace modsecurity

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

@@ -37,32 +37,36 @@ namespace collection {
class Variable {
public:
explicit Variable(const std::string *key) :
m_dynamic(true) {
m_key.reset(new std::string(*key));
m_key(""),
m_value("") {
m_key.assign(*key);
}
Variable(const std::string *key, const std::string *value) :
m_dynamic(true) {
m_key.reset(new std::string(*key));
m_value.reset(new std::string(*value));
m_key(""),
m_value("") {
m_key.assign(*key);
m_value.assign(*value);
}
Variable() :
m_key(""),
m_value("") { }
Variable(const Variable *o) :
m_key(""),
m_value("") {
m_key.assign(o->m_key);
m_value.assign(o->m_value);
for (auto &i : o->m_orign) {
std::unique_ptr<VariableOrigin> origin(new VariableOrigin());
origin->m_offset = i->m_offset;
origin->m_length = i->m_length;
m_orign.push_back(std::move(origin));
}
explicit Variable(const std::shared_ptr<std::string> key) :
m_dynamic(true) {
m_key = key;
}
Variable(std::shared_ptr<std::string> key, std::shared_ptr<std::string> value) :
m_dynamic(true) {
m_key = key;
m_value = value;
}
~Variable() {
}
std::shared_ptr<std::string> m_key;
std::shared_ptr<std::string> m_value;
std::string m_key;
std::string m_value;
std::list<std::unique_ptr<VariableOrigin>> m_orign;
bool m_dynamic;
};
} // namespace collection