From: Anna Norokh -X (anorokh - SOFTSERVE INC at Cisco) <anorokh@cisco.com>
Date: Fri, 5 Dec 2025 17:38:21 +0000 (+0000)
Subject: Pull request #5031: mime: improve form-data collection for incomplete boundaries
X-Git-Tag: 3.10.1.0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515d4ca4864d11e7031e20cfbd7c60cc3066afa2;p=thirdparty%2Fsnort3.git

Pull request #5031: mime: improve form-data collection for incomplete boundaries

Merge in SNORT/snort3 from ~ANOROKH/snort3:improve_form_data_collection to master

Squashed commit of the following:

commit 46cfe4731ceda80b8ffca47b296355e5fbe85fd4
Author: anorokh <anorokh@cisco.com>
Date:   Fri Dec 5 12:32:55 2025 +0200

    mime: improve form-data collection for incomplete boundaries
---

diff --git a/src/mime/file_mime_process.h b/src/mime/file_mime_process.h
index 0ee9d6e94..e47d7f3cc 100644
--- a/src/mime/file_mime_process.h
+++ b/src/mime/file_mime_process.h
@@ -87,7 +87,11 @@ public:
     bool is_host_set() const;
 
     MimeFormDataCollector::FieldVector&& form_data_content()
-    { return std::move(form_data_collector.take_fields()); }
+    {
+        form_data_collector.finalize_field(filename);
+        form_data_collector.reset_part();
+        return std::move(form_data_collector.take_fields());
+    }
 
     const BufferData& get_ole_buf();
     const BufferData& get_vba_inspect_buf();