From: Steve Chew (stechew) <stechew@cisco.com>
Date: Fri, 18 Dec 2020 19:25:27 +0000 (+0000)
Subject: Merge pull request #2673 in SNORT/snort3 from ~SBAIGAL/snort3:ha_leak to master
X-Git-Tag: 3.0.3-6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eef89a24098e3fafa90430d9cc47d35762b9303e;p=thirdparty%2Fsnort3.git

Merge pull request #2673 in SNORT/snort3 from ~SBAIGAL/snort3:ha_leak to master

Squashed commit of the following:

commit 346acd5e8b316701a2f5b7e98ff780bd6e68a095
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Wed Dec 16 16:00:06 2020 -0500

    reload_config: fix memory leak casued by incorrect code merge
---

diff --git a/src/main.cc b/src/main.cc
index 9b044399a..8282d9ed4 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -370,12 +370,6 @@ int main_reload_config(lua_State* L)
         return 0;
     }
 
-    if ( !sc->attribute_hosts_file.empty() )
-    {
-        if ( !HostAttributesManager::load_hosts_file(sc, sc->attribute_hosts_file.c_str()) )
-            current_request->respond("== reload failed - host attributes file failed to load\n");
-    }
-
     int32_t num_hosts = HostAttributesManager::get_num_host_entries();
     if ( num_hosts >= 0 )
         LogMessage( "host attribute table: %d hosts loaded\n", num_hosts);