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

Moving the rules deletion to the RuleProperties class

Browse Source 
The deletion was happning on the Rule class due to historical reasons.
The consequence of that was a parser memory leak.
This commit is contained in:
Felipe Zimmerle 2017-01-06 01:09:41 -03:00 committed by Felipe Zimmerle
parent 068a3eb517
commit a8e5cce744
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
5 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
headers/modsecurity/actions/action.h
View File

@ -41,7 +41,7 @@ class Action {
: action_kind(2),
m_isNone(false),
m_name(""),
m_referenceCount(0),
m_referenceCount(1),
m_parser_payload(""),
temporaryAction(false) {
set_name_and_payload(_action);
@ -50,7 +50,7 @@ class Action {
: action_kind(kind),
m_isNone(false),
m_name(""),
m_referenceCount(0),
m_referenceCount(1),
m_parser_payload(""),
temporaryAction(false) {
set_name_and_payload(_action);
@ -91,11 +91,13 @@ class Action {
}
}
void refCountDecreaseAndCheck() {
int refCountDecreaseAndCheck() {
this->m_referenceCount--;
if (this->m_referenceCount == 0) {
delete this;
return 1;
}
return 0;
}
void refCountIncrease() {

10
headers/modsecurity/rule.h
View File

@ -84,15 +84,17 @@ class Rule {
Rule *chainedRule;
bool chained;
void refCountDecreaseAndCheck() {
this->m_referenceCount--;
if (this->m_referenceCount == 0) {
int refCountDecreaseAndCheck() {
m_referenceCount--;
if (m_referenceCount == 0) {
delete this;
return 1;
}
return 0;
}
void refCountIncrease() {
this->m_referenceCount++;
m_referenceCount++;
}
std::string m_rev;

23
headers/modsecurity/rules_properties.h
View File

@ -102,6 +102,29 @@ class RulesProperties {
~RulesProperties() {
int i = 0;
/** Cleanup the rules */
for (i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
std::vector<Rule *> rules = m_rules[i];
while (rules.empty() == false) {
Rule *rule = rules.back();
rules.pop_back();
if (rule->refCountDecreaseAndCheck()) {
rule = NULL;
}
}
}
for (i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
std::vector<actions::Action *> *tmp = &m_defaultActions[i];
while (tmp->empty() == false) {
actions::Action *a = tmp->back();
tmp->pop_back();
if (a->refCountDecreaseAndCheck()) {
a = NULL;
}
}
}
delete m_debugLog;
delete m_auditLog;
}

4
src/rule.cc
View File

@ -94,7 +94,7 @@ Rule::Rule(std::string marker)
m_secmarker(true),
m_marker(marker),
m_maturity(0),
m_referenceCount(0),
m_referenceCount(1),
m_fileName(""),
m_lineNumber(0) { }
@ -113,7 +113,7 @@ Rule::Rule(Operator *_op,
m_secmarker(false),
m_marker(""),
m_maturity(0),
m_referenceCount(0),
m_referenceCount(1),
m_fileName(fileName),
m_lineNumber(lineNumber) {
if (actions != NULL) {

20
src/rules.cc
View File

@ -78,28 +78,8 @@ void Rules::decrementReferenceCount(void) {
Rules::~Rules() {
int i = 0;
free(unicode_map_table);
unicode_map_table = NULL;
/** Cleanup the rules */
for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
std::vector<Rule *> rules = m_rules[i];
while (rules.empty() == false) {
Rule *rule = rules.back();
rule->refCountDecreaseAndCheck();
rules.pop_back();
}
}
for (i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
std::vector<actions::Action *> *tmp = &m_defaultActions[i];
while (tmp->empty() == false) {
actions::Action *a = tmp->back();
a->refCountDecreaseAndCheck();
tmp->pop_back();
}
}
}