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

Fix bad merge of mem pool fix from trunk.

Browse Source 
Update to latest core rules.
This commit is contained in:
brectanus
2007-06-14 18:46:58 +00:00
parent a2a52b9ae7
commit 7141419f80
15 changed files with 1314 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apache2/mod_security2.c
View File

@@ -351,6 +351,8 @@ static modsec_rec *create_tx_context(request_rec *r) {
msr_log(msr, 4, "Transaction context created (dcfg %x).", msr->dcfg1);
}
msr->msc_rule_mptmp = NULL;
return msr;
}

4
apache2/re.c
View File

@@ -1379,7 +1379,6 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) {
rc = execute_operator(var, rule, msr, acting_actionset, mptmp);
if (rc < 0) {
apr_pool_destroy(mptmp);
return -1;
}
@@ -1403,7 +1402,6 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) {
rc = metadata->execute(mptmp, (unsigned char *)var->value, var->value_len,
&rval, &rval_length);
if (rc < 0) {
apr_pool_destroy(mptmp);
return -1;
}
@@ -1429,7 +1427,6 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) {
rc = execute_operator(var, rule, msr, acting_actionset, mptmp);
if (rc < 0) {
apr_pool_destroy(mptmp);
return -1;
}
@@ -1447,7 +1444,6 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) {
}
}
apr_pool_destroy(mptmp);
return (match_count ? RULE_MATCH : RULE_NO_MATCH);
}