From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Fri, 25 Jun 2021 19:22:39 +0000 (+0000)
Subject: Merge pull request #2953 in SNORT/snort3 from ~SATHIRKA/snort3:mem_track_mimesession... 
X-Git-Tag: 3.1.7.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cdb75d5fa122251be1a045e7db453dafb07e87d;p=thirdparty%2Fsnort3.git

Merge pull request #2953 in SNORT/snort3 from ~SATHIRKA/snort3:mem_track_mimesession to master

Squashed commit of the following:

commit d8b5ba3d0e62d020189b2ec9012bb21d63e0240a
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Thu Jun 24 15:44:33 2021 -0400

    mime: Track memory for mime sessions
---

diff --git a/src/mime/file_mime_process.cc b/src/mime/file_mime_process.cc
index 9dc51c7b3..08973f3c7 100644
--- a/src/mime/file_mime_process.cc
+++ b/src/mime/file_mime_process.cc
@@ -30,6 +30,7 @@
 #include "file_api/file_flows.h"
 #include "hash/hash_key_operations.h"
 #include "log/messages.h"
+#include "memory/memory_cap.h"
 #include "search_engines/search_tool.h"
 #include "utils/util_cstring.h"
 
@@ -812,10 +813,12 @@ MimeSession::MimeSession(Packet* p, DecodeConfig* dconf, MailLogConfig* lconf, u
     session_base_file_id = base_file_id;
     is_http = session_is_http;
     reset_mime_paf_state(&mime_boundary);
+    memory::MemoryCap::update_allocations(sizeof(*this));
 }
 
 MimeSession::~MimeSession()
 {
+    memory::MemoryCap::update_deallocations(sizeof(*this));
     if ( decode_state )
         delete(decode_state);
 }