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

Merge pull request #3074 from airween/v2/fixbuildissue

Browse Source 
V2/fixbuildissue
This commit is contained in:
Ervin Hegedus
2024-02-08 00:32:29 +01:00
committed by GitHub
parent b9df8eec4c 1d682c0e03
commit 20656317d6
2 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CHANGES
View File

@@ -1,34 +1,6 @@
DD mmm YYYY - 2.9.x (to be released) DD mmm YYYY - 2.9.x (to be released)
------------------- -------------------
* Support for PCRE2 in Windows
[PR #2931, @leancz]
* Fix ; incorrectly replaced by space in t:cmdline
[PR #3051, @marcstern]
* Add some syntax validation
[PR #2994, @marcstern]
* Optimize macro processing
[PR #2992/3004, @marcstern]
* Add detailed error message when writing collections
[PR #3050, @marcstern]
* Add context info to error message
[PR #2997, @marcstern]
* Fix ctl:ruleRemoveByTag that isn't executed if no rule id is present
[PR #3012, @marcstern]
* Ignore empty action instead of storing it
[PR #3003, @marcstern]
* Fixed memory leak if builded modsecurity with --enable-pcre-study
[Issue #610, @marcstern]
* Remove useless code
[PR #2953/2954, @marcstern]
* Centralized function to get user name, compatible with Linux & Windows
[PR #2956, @marcstern]
* Compatibility with libyajl decoding the buffer inline
[PR #2957, @marcstern]
* Fixed memory leaks
[PR #2960/2963/2969, @marcstern]
* Fixed uninitialized variable
[PR #2987, @marcstern]
* Set the minimum security protocol version for SecRemoteRules * Set the minimum security protocol version for SecRemoteRules
[Issue security/code-scanning/2 - @airween] [Issue security/code-scanning/2 - @airween]
* Allow lua version 5.4 * Allow lua version 5.4

19
apache2/re_operators.c
View File

@@ -630,13 +630,18 @@ nextround:
} }
if(msr->stream_input_data != NULL && input_body == 1) { if(msr->stream_input_data != NULL && input_body == 1) {
memset(msr->stream_input_data, 0x0, msr->stream_input_length);
free(msr->stream_input_data); free(msr->stream_input_data);
msr->stream_input_data = NULL; msr->stream_input_data = NULL;
msr->stream_input_length = 0; msr->stream_input_length = 0;
#ifdef MSC_LARGE_STREAM_INPUT #ifdef MSC_LARGE_STREAM_INPUT
msr->stream_input_allocated_length = 0; msr->stream_input_allocated_length = 0;
#endif
msr->stream_input_data = (char *)malloc(size);
#else
msr->stream_input_data = (char *)malloc(size+1); msr->stream_input_data = (char *)malloc(size+1);
#endif
if(msr->stream_input_data == NULL) { if(msr->stream_input_data == NULL) {
return -1; return -1;
} }
@@ -644,11 +649,16 @@ nextround:
msr->stream_input_length = size; msr->stream_input_length = size;
#ifdef MSC_LARGE_STREAM_INPUT #ifdef MSC_LARGE_STREAM_INPUT
msr->stream_input_allocated_length = size; msr->stream_input_allocated_length = size;
memset(msr->stream_input_data, 0x0, size);
#else
memset(msr->stream_input_data, 0x0, size+1);
#endif #endif
msr->if_stream_changed = 1; msr->if_stream_changed = 1;
memcpy(msr->stream_input_data, data, size); memcpy(msr->stream_input_data, data, size);
#ifndef MSC_LARGE_STREAM_INPUT
msr->stream_input_data[size] = '\0'; msr->stream_input_data[size] = '\0';
#endif
var->value_len = size; var->value_len = size;
var->value = msr->stream_input_data; var->value = msr->stream_input_data;
@@ -751,6 +761,7 @@ static int msre_op_validateHash_execute(modsec_rec *msr, msre_rule *rule, msre_v
char *my_error_msg = NULL; char *my_error_msg = NULL;
int ovector[33]; int ovector[33];
int rc; int rc;
const char *pattern = NULL;
#ifdef WITH_PCRE_STUDY #ifdef WITH_PCRE_STUDY
#ifdef WITH_PCRE_JIT #ifdef WITH_PCRE_JIT
int jit; int jit;
@@ -780,7 +791,7 @@ static int msre_op_validateHash_execute(modsec_rec *msr, msre_rule *rule, msre_v
expand_macros(msr, re_pattern, rule, msr->mp); expand_macros(msr, re_pattern, rule, msr->mp);
const char *pattern = log_escape_re(msr->mp, re_pattern->value); pattern = log_escape_re(msr->mp, re_pattern->value);
if (msr->txcfg->debuglog_level >= 6) { if (msr->txcfg->debuglog_level >= 6) {
msr_log(msr, 6, "Escaping pattern [%s]",pattern); msr_log(msr, 6, "Escaping pattern [%s]",pattern);
} }
@@ -1534,10 +1545,10 @@ static const char *gsb_replace_tpath(apr_pool_t *pool, const char *domain, int l
url = apr_palloc(pool, len + 1); url = apr_palloc(pool, len + 1);
data = apr_palloc(pool, len + 1); data = apr_palloc(pool, len + 1);
data[0] = '\0'; memset(data, 0, len+1);
memset(url, 0, len+1);
memcpy(url, domain, len); memcpy(url, domain, len);
url[len] = 0;
while(( pos = strstr(url , "/./" )) != NULL) { while(( pos = strstr(url , "/./" )) != NULL) {
match = 1; match = 1;