Skip to content

Commit e0ff7ed

Browse files
authored
Merge pull request #2794 from martinhsv/v2/master
Limit rsub null termination to where necessary
2 parents 592519f + d9df7f5 commit e0ff7ed

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
DD mmm YYYY - 2.9.x (to be released)
22
-------------------
33

4+
* Limit rsub null termination to where necessary
5+
[Issue #2794 - @marcstern, @martinhsv]
46
* IIS: Update dependencies for next planned release
57
[@martinhsv]
68
* XML parser cleanup: NULL duplicate pointer

apache2/re_operators.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,9 @@ static int msre_op_rsub_execute(modsec_rec *msr, msre_rule *rule, msre_var *var,
656656
msr->if_stream_changed = 1;
657657

658658
memcpy(msr->stream_input_data, data, size);
659+
#ifndef MSC_LARGE_STREAM_INPUT
659660
msr->stream_input_data[size] = '\0';
661+
#endif
660662

661663
var->value_len = size;
662664
var->value = msr->stream_input_data;

0 commit comments

Comments
 (0)