From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Thu, 24 Oct 2019 22:13:42 +0000 (-0400)
Subject: Merge pull request #1821 in SNORT/snort3 from ~MASHASAN/snort3:umap_find to master
X-Git-Tag: 3.0.0-263~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe73fe918e1c0a4ae69121554dc6dbc5ca8a074;p=thirdparty%2Fsnort3.git

Merge pull request #1821 in SNORT/snort3 from ~MASHASAN/snort3:umap_find to master

Squashed commit of the following:

commit 76fd90fe0d4c2d5be45f900600398224ccf3b25f
Author: Masud Hasan <mashasan@cisco.com>
Date:   Thu Oct 24 13:38:31 2019 -0400

    policy: Avoid unintended insertion of policy into map if it does not exist
---

diff --git a/src/main/policy.h b/src/main/policy.h
index ba8088674..5351462e0 100644
--- a/src/main/policy.h
+++ b/src/main/policy.h
@@ -210,10 +210,16 @@ public:
     { user_network[p->user_policy_id] = p; }
 
     IpsPolicy* get_user_ips(unsigned user_id)
-    { return user_ips[user_id]; }
+    {
+        auto it = user_ips.find(user_id);
+        return it == user_ips.end() ? nullptr : it->second;
+    }
 
     NetworkPolicy* get_user_network(unsigned user_id)
-    { return user_network[user_id]; }
+    {
+        auto it = user_network.find(user_id);
+        return it == user_network.end() ? nullptr : it->second;
+    }
 
     InspectionPolicy* get_inspection_policy(unsigned i = 0)
     { return i < inspection_policy.size() ? inspection_policy[i] : nullptr; }