From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Mon, 30 Sep 2019 14:38:33 +0000 (-0400)
Subject: Merge pull request #1772 in SNORT/snort3 from ~MMATIRKO/snort3:luajit_segv_changes... 
X-Git-Tag: 3.0.0-262~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aae9efeba14bfb8159df4b91d4db483ad4f59a7c;p=thirdparty%2Fsnort3.git

Merge pull request #1772 in SNORT/snort3 from ~MMATIRKO/snort3:luajit_segv_changes to master

Squashed commit of the following:

commit 8c227975324878d84517fba99ae8a4710f24c5ac
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Mon Sep 30 09:41:11 2019 -0400

    ips_options: minor code style changes
---

diff --git a/src/ips_options/ips_luajit.cc b/src/ips_options/ips_luajit.cc
index 78a34c887..a78fc3167 100644
--- a/src/ips_options/ips_luajit.cc
+++ b/src/ips_options/ips_luajit.cc
@@ -143,7 +143,7 @@ LuaJitOption::LuaJitOption(
 
     unsigned max = ThreadConfig::get_instance_max();
     states.reserve(max);
- 
+
     for ( unsigned i = 0; i < max; ++i )
     {
         states.emplace_back(true);
diff --git a/src/lua/lua.cc b/src/lua/lua.cc
index 0555858fb..99ad85cfb 100644
--- a/src/lua/lua.cc
+++ b/src/lua/lua.cc
@@ -56,7 +56,7 @@ State& State::operator=(State&& o)
 State::State(State&& o) noexcept 
 {
     state = o.state; 
-    o.state = NULL; 
+    o.state = nullptr; 
 }
 
 State::~State()