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

Merge pull request #2954 from marcstern/v2/mst/optim2

Browse Source 
remove useless memset
This commit is contained in:
Marc Stern
2024-02-01 11:08:09 +01:00
committed by GitHub
parent c2e20f6501 931f8b6ed4
commit 26d2b0d069
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apache2/re_operators.c
View File

@@ -630,18 +630,13 @@ 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;
msr->stream_input_data = (char *)malloc(size);
#else
msr->stream_input_data = (char *)malloc(size+1);
#endif #endif
msr->stream_input_data = (char *)malloc(size+1);
if(msr->stream_input_data == NULL) { if(msr->stream_input_data == NULL) {
return -1; return -1;
} }
@@ -649,16 +644,11 @@ 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;
@@ -761,7 +751,6 @@ 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 = 0; int jit = 0;
@@ -791,8 +780,8 @@ 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);
pattern = log_escape_re(msr->mp, re_pattern->value);
if (msr->txcfg->debuglog_level >= 6) { if (msr->txcfg->debuglog_level >= 6) {
const char *pattern = log_escape_re(msr->mp, re_pattern->value);
msr_log(msr, 6, "Escaping pattern [%s]",pattern); msr_log(msr, 6, "Escaping pattern [%s]",pattern);
} }
@@ -1545,10 +1534,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);
memset(data, 0, len+1); data[0] = '\0';
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;