From: Pranav Bhalerao (prbhaler) Date: Fri, 12 Nov 2021 08:45:19 +0000 (+0000) Subject: Pull request #3162: ips_option: Enabling trace for vba_data options and fixing memory... X-Git-Tag: 3.1.17.0~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=748afd1488ba2ceb157837e707998ea43387efc4;p=thirdparty%2Fsnort3.git Pull request #3162: ips_option: Enabling trace for vba_data options and fixing memory leak while extracting vba_data Merge in SNORT/snort3 from ~VIGNVISW/snort3:vignvisw_CSCwa12304 to master Squashed commit of the following: commit 4dce4794eea4a63b0fe8c77907d24aaed3e198d3 Author: Vigneshwari Viswanathan Date: Thu Nov 11 03:04:44 2021 -0500 ips_option: Enabling trace for vba_data options and fixing memory leak while extracting vba_data --- diff --git a/src/decompress/file_olefile.cc b/src/decompress/file_olefile.cc index dce7dc4b2..73dc1cd97 100644 --- a/src/decompress/file_olefile.cc +++ b/src/decompress/file_olefile.cc @@ -719,6 +719,10 @@ void OleFile :: find_and_extract_vba(uint8_t*& vba_buf, uint32_t& vba_buf_len) } } vba_buf_len = vba_buffer_offset; + + //Delete vba_buf if decompression could not happen + if (!vba_buf_len) + delete[] vba_buf; } // Beginning function of ole file processing. diff --git a/src/ips_options/ips_vba_data.cc b/src/ips_options/ips_vba_data.cc index 94412d27f..6305bf06a 100644 --- a/src/ips_options/ips_vba_data.cc +++ b/src/ips_options/ips_vba_data.cc @@ -51,12 +51,8 @@ void VbaDataModule::set_trace(const Trace* trace) const const TraceOption* VbaDataModule::VbaDataModule::get_trace_options() const { - #ifndef DEBUG_MSGS - return nullptr; - #else - static const TraceOption vba_data_trace_options(nullptr, 0, nullptr); - return &vba_data_trace_options; - #endif + static const TraceOption vba_data_trace_options(nullptr, 0, nullptr); + return &vba_data_trace_options; } //-------------------------------------------------------------------------