]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #820 in SNORT/snort3 from noname_daqs to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 17 Feb 2017 23:04:32 +0000 (18:04 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 17 Feb 2017 23:04:32 +0000 (18:04 -0500)
Squashed commit of the following:

commit fa60f46919821462077a54661f7bd5171eecc191
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Feb 17 14:30:22 2017 -0500

    support DAQs w/o explicit sources (nfq, ipfw)

src/main/analyzer.cc

index 9b98b657b4199482aa9495bf32e598146f4bbadf..97398b97f72af36e93afddbb54be0b9afa3227c4 100644 (file)
@@ -74,7 +74,7 @@ const char* Analyzer::get_state_string()
 Analyzer::Analyzer(unsigned i, const char* s)
 {
     id = i;
-    source = s;
+    source = s ? s : "";
     daq_instance = nullptr;
     privileged_start = false;
     exit_requested = false;