Skip to content

Missing null byte + optimization #3153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 28, 2024
Merged

Missing null byte + optimization #3153

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5a6d6b
Revert to OWASP
Feb 20, 2024
ca7b4b4
Merge branch 'v2/master' of https://github.com/marcstern/ModSecurity …
May 16, 2024
d45c4ba
spaces
May 16, 2024
c7c7881
space
May 16, 2024
e803cdd
Merge branch 'v2/master' of https://github.com/marcstern/ModSecurity …
May 24, 2024
4a992b5
Replace a memset to 0 by a single assignment and fixing the 0 byte mi…
May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions apache2/re_operators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,29 +649,20 @@ static int msre_op_rsub_execute(modsec_rec *msr, msre_rule *rule, msre_var *var,
msr->stream_input_length = 0;
#ifdef MSC_LARGE_STREAM_INPUT
msr->stream_input_allocated_length = 0;

msr->stream_input_data = (char *)malloc(size);
#else
msr->stream_input_data = (char *)malloc(size+1);
#endif

msr->stream_input_data = (char *)malloc(size+1);
if(msr->stream_input_data == NULL) {
return -1;
}

msr->stream_input_length = size;
#ifdef MSC_LARGE_STREAM_INPUT
msr->stream_input_allocated_length = size;
memset(msr->stream_input_data, 0x0, size);
#else
memset(msr->stream_input_data, 0x0, size+1);
#endif
msr->if_stream_changed = 1;

memcpy(msr->stream_input_data, data, size);
#ifndef MSC_LARGE_STREAM_INPUT
msr->stream_input_data[size] = '\0';
#endif

var->value_len = size;
var->value = msr->stream_input_data;
Expand Down