From 6dafdb2b97247771737546c3788c3ec64c356ef0 Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Thu, 8 Feb 2024 00:07:20 +0100 Subject: [PATCH] Revert "remove useless memset" This reverts commit 3dc5ff5f6532a9222bc9607f5f2dd34b28ca6fe4. --- apache2/re_operators.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apache2/re_operators.c b/apache2/re_operators.c index 77b1b413..899290c4 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -630,13 +630,18 @@ nextround: } if(msr->stream_input_data != NULL && input_body == 1) { + memset(msr->stream_input_data, 0x0, msr->stream_input_length); free(msr->stream_input_data); msr->stream_input_data = NULL; msr->stream_input_length = 0; #ifdef MSC_LARGE_STREAM_INPUT msr->stream_input_allocated_length = 0; -#endif + + msr->stream_input_data = (char *)malloc(size); +#else msr->stream_input_data = (char *)malloc(size+1); +#endif + if(msr->stream_input_data == NULL) { return -1; } @@ -644,11 +649,16 @@ nextround: 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;