Merge pull request #1082 in SNORT/snort3 from resume_crash to master

Squashed commit of the following:

commit 57d317a56fe910cffdf95db9c60fcc57f9a1e109
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Dec 6 11:42:37 2017 -0500

    shell: fixed crash when issuing control commands

diff --git a/src/main/control_mgmt.cc b/src/main/control_mgmt.cc
index dcadab65a924fdeec02b0fc0c9da646083e4bc66..129be1baa78c7b9b26577eec7ede43e0e7d83216 100644 (file)
--- a/src/main/control_mgmt.cc
+++ b/src/main/control_mgmt.cc
@@ -256,11 +256,14 @@ bool ControlMgmt::service_users(int& current_fd, Request*& current_request)
     {
         ret = process_control_commands(current_fd, current_request);
 
-        if ( FD_ISSET(listener, &inputs) )
+        if ( listener >= 0 )
         {
-            if ( !socket_conn() )
+            if ( FD_ISSET(listener, &inputs) )
             {
-                ret = true;
+                if ( !socket_conn() )
+                {
+                    ret = true;
+                }
             }
         }
     }