From: Jason Ish <ish@unx.ca>
Date: Wed, 9 May 2018 12:50:03 +0000 (-0600)
Subject: eve/json/xff - remove check for flow being NULL.
X-Git-Tag: suricata-4.1.0-rc1~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3372%2Fhead;p=thirdparty%2Fsuricata.git

eve/json/xff - remove check for flow being NULL.

Fix Coverity issue:
** CID 1435535:  Null pointer dereferences  (REVERSE_INULL)
/src/output-json-file.c: 212 in JsonBuildFileInfoRecord()

Where we check a variable for being NULL, when all paths to the
code show that it can't be NULL.
---

diff --git a/src/output-json-file.c b/src/output-json-file.c
index 56d3f56589..29e70a7b55 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -209,7 +209,7 @@ json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff,
     json_object_set_new(fjs, "tx_id", json_integer(ff->txid));
 
     /* xff header */
-    if ((xff_cfg != NULL) && !(xff_cfg->flags & XFF_DISABLED) && p->flow != NULL) {
+    if ((xff_cfg != NULL) && !(xff_cfg->flags & XFF_DISABLED)) {
         int have_xff_ip = 0;
         char buffer[XFF_MAXLEN];