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

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 78a34c887283a3d4304733038d9459acda496e62..a78fc31678983b182eab37b824eb9e56c4d6e554 100644 (file)
--- 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 0555858fb6e1b1b62bcc68bfd55eada937a21a06..99ad85cfb45be47c5529d8bd675ad22b16c4cc6c 100644 (file)
--- 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()