Merge pull request #3061 from owasp-modsecurity/revert-2992-v2/mst/expand_macros_optim

airween · web-flow · commit 5e19d37bd57c · 2024-02-07T23:03:58.000+01:00
Revert "Avoid some useless code and memory allocation in case no macro is present"
diff --git a/apache2/re_actions.c b/apache2/re_actions.c
@@ -273,7 +273,6 @@ int expand_macros(modsec_rec *msr, msc_string *var, msre_rule *rule, apr_pool_t
                 next_text_start = p + 1;
             }
         } else {
-            if (arr->nelts == 0) return 0; /* no macro */
             /* Text part. */
             part = (msc_string *)apr_pcalloc(mptmp, sizeof(msc_string));
             part->value = apr_pstrdup(mptmp, text_start);

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,6 @@ int expand_macros(modsec_rec msr, msc_string var, msre_rule *rule, apr_pool_t`
`273`	`273`	`next_text_start = p + 1;`
`274`	`274`	`}`
`275`	`275`	`} else {`
`276`		`- if (arr->nelts == 0) return 0; /* no macro */`
`277`	`276`	`/* Text part. */`
`278`	`277`	`part = (msc_string *)apr_pcalloc(mptmp, sizeof(msc_string));`
`279`	`278`	`part->value = apr_pstrdup(mptmp, text_start);`