From: Bhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Date: Thu, 2 Dec 2021 07:16:40 +0000 (+0000)
Subject: Pull request #3193: file_api: Added null check for user file data
X-Git-Tag: 3.1.19.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dbcf14c4c86fd4187de963d337936ed88dbb4fe;p=thirdparty%2Fsnort3.git

Pull request #3193: file_api: Added null check for user file data

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>
---

diff --git a/src/file_api/file_lib.cc b/src/file_api/file_lib.cc
index 3edd9cc99..78680f653 100644
--- a/src/file_api/file_lib.cc
+++ b/src/file_api/file_lib.cc
@@ -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 )