From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Mon, 18 Mar 2019 13:03:05 +0000 (-0400)
Subject: Merge pull request #1547 in SNORT/snort3 from ~SHRARANG/snort3:cppcheck_unified2_warn... 
X-Git-Tag: 3.0.0-251~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=316e730ebb4f8bf829969d23e8c6f6a0036f432f;p=thirdparty%2Fsnort3.git

Merge pull request #1547 in SNORT/snort3 from ~SHRARANG/snort3:cppcheck_unified2_warning to master

Squashed commit of the following:

commit 5dd20b0132607f4e6d597a3ac467de25671c32b7
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Wed Mar 13 13:27:29 2019 -0400

    loggers: workaround for cppcheck's false warning
---

diff --git a/src/loggers/unified2.cc b/src/loggers/unified2.cc
index bbc78de71..0ba602686 100644
--- a/src/loggers/unified2.cc
+++ b/src/loggers/unified2.cc
@@ -319,8 +319,9 @@ static void AlertExtraData(
         uint32_t len = 0;
         uint32_t type = 0;
         uint8_t* write_buffer;
+        LogFunction log_func = log_funcs[xid-1];
 
-        if ( log_funcs[xid-1](flow, &write_buffer, &len, &type) && (len > 0) )
+        if ( log_func(flow, &write_buffer, &len, &type) && (len > 0) )
         {
             _WriteExtraData(config, event_id, event_second, write_buffer, len, type);
         }