github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 03:34:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoid additional operator invokation if last transform of a multimatch doesn't modify the input

Browse Source 
Fixes #1086
This commit is contained in:
Daniel Stelter-Gliese
2016-03-02 11:00:40 +01:00
committed by Felipe Zimmerle
parent 9ac9ff8223
commit 72f632e9b6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,9 @@
DD MMM YYYY - 2.9.2 - To be released DD MMM YYYY - 2.9.2 - To be released
------------------------------------ ------------------------------------
* Avoid additional operator invokation if last transform of a multimatch
doesn't modify the input
[Issue #1086, #1087 - Daniel Stelter-Gliese]
* Adds a sanity check before use ctl:ruleRemoveTargetByTag. * Adds a sanity check before use ctl:ruleRemoveTargetByTag.
[Issue #1353 - @LukeP21 and @zimmerle] [Issue #1353 - @LukeP21 and @zimmerle]
* Uses an optional global lock while manipulating collections. * Uses an optional global lock while manipulating collections.

7
apache2/re.c
View File

@@ -2872,7 +2872,10 @@ static apr_status_t msre_rule_process_normal(msre_rule *rule, modsec_rec *msr) {
arr = apr_table_elts(tartab); arr = apr_table_elts(tartab);
te = (apr_table_entry_t *)arr->elts; te = (apr_table_entry_t *)arr->elts;
for (i = 0; i < arr->nelts; i++) { for (i = 0; i < arr->nelts; i++) {
/* Variable was modified by *any* transformation */
int changed; int changed;
/* Variable was modified by *last applied* transformation (needed by multimatch) */
int tfnchanged;
int usecache = 0; int usecache = 0;
apr_table_t *cachetab = NULL; apr_table_t *cachetab = NULL;
apr_time_t time_before_trans = 0; apr_time_t time_before_trans = 0;
@@ -2995,8 +2998,8 @@ static apr_status_t msre_rule_process_normal(msre_rule *rule, modsec_rec *msr) {
apr_table_t *normtab; apr_table_t *normtab;
const char *lastvarval = NULL; const char *lastvarval = NULL;
apr_size_t lastvarlen = 0; apr_size_t lastvarlen = 0;
int tfnchanged = 0;
tfnchanged = 0;
changed = 0; changed = 0;
normtab = apr_table_make(mptmp, 10); normtab = apr_table_make(mptmp, 10);
if (normtab == NULL) return -1; if (normtab == NULL) return -1;
@@ -3278,7 +3281,7 @@ static apr_status_t msre_rule_process_normal(msre_rule *rule, modsec_rec *msr) {
* or if it is and we need to process the result of the * or if it is and we need to process the result of the
* last transformation. * last transformation.
*/ */
if (!multi_match || changed) { if (!multi_match || tfnchanged) {
invocations++; invocations++;
#if defined(PERFORMANCE_MEASUREMENT) #if defined(PERFORMANCE_MEASUREMENT)