]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #3193: file_api: Added null check for user file data
authorBhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Thu, 2 Dec 2021 07:16:40 +0000 (07:16 +0000)
committerBhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Thu, 2 Dec 2021 07:16:40 +0000 (07:16 +0000)
Merge in SNORT/snort3 from ~BSACHDEV/snort3:file_changes to master

Squashed commit of the following:

commit 34a2a0a7f372e3614024a8dddad9b58d7c46c99d
Author: bsachdev <bsachdev@cisco.com>
Date:   Wed Dec 1 12:10:02 2021 -0500

    file_api: Added null check for user file data

Signed-off-by: bsachdev <bsachdev@cisco.com>
src/file_api/file_lib.cc

index 3edd9cc99954a9aa877e0ee8d48456fa8948c33b..78680f653e03165b2b93ff6c44f4405e13672978 100644 (file)
@@ -358,7 +358,7 @@ void FileContext::log_file_event(Flow* flow, FilePolicyBase* policy)
             break;
         }
 
-        if (policy and log_needed)
+        if (policy and log_needed and user_file_data)
             policy->log_file_action(flow, this, FILE_ACTION_DEFAULT);
 
         if ( config->trace_type )