From: Ted Bedwell <ted@manor.org>
Date: Fri, 21 Dec 2018 15:14:43 +0000 (-0500)
Subject: build: Alpine Integration -clear segfault in cpputest on musl/Alpine (#71)
X-Git-Tag: 3.0.0-251~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcbd9fefc62b061e9be4ce28e838d8e8c0f2160f;p=thirdparty%2Fsnort3.git

build: Alpine Integration -clear segfault in cpputest on musl/Alpine (#71)

* build: Alpine Integration -clear segfault in cpputest on musl/Alpine
---

diff --git a/src/network_inspectors/appid/test/appid_detector_test.cc b/src/network_inspectors/appid/test/appid_detector_test.cc
index 463680e1a..1c1accd55 100644
--- a/src/network_inspectors/appid/test/appid_detector_test.cc
+++ b/src/network_inspectors/appid/test/appid_detector_test.cc
@@ -36,9 +36,6 @@
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>
 
-Flow* flow = nullptr;
-AppIdSession* mock_session = nullptr;
-
 void AppIdHttpSession::set_http_change_bits(AppidChangeBits&, HttpFieldIds) {}
 
 class TestDetector : public AppIdDetector
@@ -54,9 +51,14 @@ public:
 
 TEST_GROUP(appid_detector_tests)
 {
+    Flow* flow = nullptr;
+    AppIdSession* mock_session = nullptr;
+
     void setup() override
     {
         MemoryLeakWarningPlugin::turnOffNewDeleteOverloads();
+        mock_session = new AppIdSession(IpProtocol::TCP, nullptr, 1492, appid_inspector);
+        mock_session->get_http_session();
         flow = new Flow;
         flow->set_flow_data(mock_session);
     }
@@ -64,6 +66,7 @@ TEST_GROUP(appid_detector_tests)
     void teardown() override
     {
         delete flow;
+        delete mock_session;
         MemoryLeakWarningPlugin::turnOnNewDeleteOverloads();
     }
 };
@@ -115,8 +118,6 @@ TEST(appid_detector_tests, get_code_string)
 int main(int argc, char** argv)
 {
     mock_init_appid_pegs();
-    mock_session = new AppIdSession(IpProtocol::TCP, nullptr, 1492, appid_inspector);
-    mock_session->get_http_session();
     int rc = CommandLineTestRunner::RunAllTests(argc, argv);
     mock_cleanup_appid_pegs();
     return rc;