]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #5031: mime: improve form-data collection for incomplete boundaries
authorAnna Norokh -X (anorokh - SOFTSERVE INC at Cisco) <anorokh@cisco.com>
Fri, 5 Dec 2025 17:38:21 +0000 (17:38 +0000)
committerOleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Fri, 5 Dec 2025 17:38:21 +0000 (17:38 +0000)
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

src/mime/file_mime_process.h

index 0ee9d6e948e6f37a94013619653608b74b2e6409..e47d7f3cc25a2671631ed5d7578ad59baa40d7c0 100644 (file)
@@ -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();