From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Wed, 20 Jan 2021 18:51:35 +0000 (+0000)
Subject: Merge pull request #2710 in SNORT/snort3 from ~SATHIRKA/snort3:ha_crash_appid to... 
X-Git-Tag: 3.1.1.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91cc3720f45a7004174603db7480894e81fde742;p=thirdparty%2Fsnort3.git

Merge pull request #2710 in SNORT/snort3 from ~SATHIRKA/snort3:ha_crash_appid to master

Squashed commit of the following:

commit 94e65ca756857fbe3e2a8940c12e813e033a62b2
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Fri Jan 15 09:28:39 2021 -0500

    appid: always store container session api object in stash
---

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index ed7bb5832..3f678710c 100644
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -1061,7 +1061,7 @@ void AppIdSession::set_tp_payload_app_id(const Packet& p, AppidSessionDirection
 void AppIdSession::publish_appid_event(AppidChangeBits& change_bits, const Packet& p,
     bool is_http2, uint32_t http2_stream_index)
 {
-    if (!api.stored_in_stash and change_bits.any())
+    if (!api.stored_in_stash)
     {
         assert(p.flow and p.flow->stash);
         p.flow->stash->store(STASH_APPID_DATA, &api, false);