From d9df7f529e51be72d2105ea4ac2911ec8b4c9246 Mon Sep 17 00:00:00 2001 From: Martin Vierula Date: Tue, 6 Sep 2022 05:29:38 -0700 Subject: [PATCH] Limit rsub null termination to where necessary --- CHANGES | 2 ++ apache2/re_operators.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 5fb834a815..e8a008ea73 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ DD mmm YYYY - 2.9.x (to be released) ------------------- + * Limit rsub null termination to where necessary + [Issue #2794 - @marcstern, @martinhsv] * IIS: Update dependencies for next planned release [@martinhsv] * XML parser cleanup: NULL duplicate pointer diff --git a/apache2/re_operators.c b/apache2/re_operators.c index 7eb1bf2649..01db9ade6f 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -656,7 +656,9 @@ static int msre_op_rsub_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, 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;