Pull request #3162: ips_option: Enabling trace for vba_data options and fixing memory...

Merge in SNORT/snort3 from ~VIGNVISW/snort3:vignvisw_CSCwa12304 to master

Squashed commit of the following:

commit 4dce4794eea4a63b0fe8c77907d24aaed3e198d3
Author: Vigneshwari Viswanathan <vignvisw@cisco.com>
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 dce7dc4b283bb87227d2e242193fe92ee0a38b25..73dc1cd97b80a6ef2980010f2504cbc916fa6265 100644 (file)
--- 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 94412d27f01653e1e6ff16089d1152013261f5b8..6305bf06a25b14f17325549eb9e6810de2539ff1 100644 (file)
--- 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;
 }
 
 //-------------------------------------------------------------------------