From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Thu, 13 Feb 2020 21:35:38 +0000 (+0000)
Subject: Merge pull request #2005 in SNORT/snort3 from ~KAMURTHI/snort3:appid_array_init to... 
X-Git-Tag: 3.0.0-268~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51db0204f1939251d4b78e82fa5c9e7bfef2e804;p=thirdparty%2Fsnort3.git

Merge pull request #2005 in SNORT/snort3 from ~KAMURTHI/snort3:appid_array_init to master

Squashed commit of the following:

commit 0adb29e412cce1d019c6b9056f5a0247116c6a01
Author: Kanimozhi Murthi <kamurthi@cisco.com>
Date:   Thu Feb 13 14:20:29 2020 -0500

    appid: Fix array initialization on Appid
---

diff --git a/src/network_inspectors/appid/appid_config.h b/src/network_inspectors/appid/appid_config.h
index e15dce880..d089a5df3 100644
--- a/src/network_inspectors/appid/appid_config.h
+++ b/src/network_inspectors/appid/appid_config.h
@@ -172,9 +172,9 @@ private:
     SipPatternMatchers sip_matchers;
     SslPatternMatchers ssl_matchers;
 
-    std::array<AppId, APP_ID_PORT_ARRAY_SIZE> tcp_port_only = {APP_ID_NONE}; // port-only TCP services
-    std::array<AppId, APP_ID_PORT_ARRAY_SIZE> udp_port_only = {APP_ID_NONE}; // port-only UDP services
-    std::array<AppId, 256> ip_protocol = {APP_ID_NONE}; // non-TCP / UDP protocol services
+    std::array<AppId, APP_ID_PORT_ARRAY_SIZE> tcp_port_only = {}; // port-only TCP services
+    std::array<AppId, APP_ID_PORT_ARRAY_SIZE> udp_port_only = {}; // port-only UDP services
+    std::array<AppId, 256> ip_protocol = {}; // non-TCP / UDP protocol services
 };
 
 class AppIdContext