From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Tue, 20 Mar 2018 14:14:27 +0000 (-0400)
Subject: Merge pull request #1148 in SNORT/snort3 from data_bus_leak to master
X-Git-Tag: 3.0.0-245~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ba126c707ea96ebcf7b1dfbdb0b9b65c9a28aad;p=thirdparty%2Fsnort3.git

Merge pull request #1148 in SNORT/snort3 from data_bus_leak to master

Squashed commit of the following:

commit 52d96033fbb424ba968de16a4628f5974d4d5d73
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Mar 19 15:09:18 2018 -0400

    DataBus: fixed creating DataHandler when one doesn't exist
---

diff --git a/src/framework/data_bus.cc b/src/framework/data_bus.cc
index 4a07ad06b..79c39c562 100644
--- a/src/framework/data_bus.cc
+++ b/src/framework/data_bus.cc
@@ -154,9 +154,12 @@ void DataBus::_unsubscribe(const char* key, DataHandler* h)
 // notify subscribers of event
 void DataBus::_publish(const char* key, DataEvent& e, Flow* f)
 {
-    DataList& v = map[key];
+    auto v = map.find(key);
 
-    for ( auto* h : v )
-        h->handle(e, f);
+    if ( v != map.end() )
+    {
+        for ( auto* h : v->second )
+            h->handle(e, f);
+    }
 }