From 04dd363279283c56d205f0979aaa09aa70409391 Mon Sep 17 00:00:00 2001 From: Bernhard Amann Date: Mon, 27 May 2013 20:30:03 -0700 Subject: [PATCH 1/3] accept libmagic starting from 5.03 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b95b637770..284cd0dfa2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if (MISSING_PREREQS) message(FATAL_ERROR "Configuration aborted due to missing prerequisites") endif () -set(libmagic_req 5.04) +set(libmagic_req 5.03) if ( LibMagic_VERSION VERSION_LESS ${libmagic_req} ) message(FATAL_ERROR "libmagic of at least version ${libmagic_req} required " "(found ${LibMagic_VERSION})") From bcc81a1a143c2715240e9822c0c52760bc9b5006 Mon Sep 17 00:00:00 2001 From: Bernhard Amann Date: Mon, 27 May 2013 21:10:51 -0700 Subject: [PATCH 2/3] Sorry, that libmagic version actually might have some problems - at least on the linux distribution I have access to. So... it was a bad idea. Revert "accept libmagic starting from 5.03" This reverts commit 04dd363279283c56d205f0979aaa09aa70409391. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 284cd0dfa2..b95b637770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if (MISSING_PREREQS) message(FATAL_ERROR "Configuration aborted due to missing prerequisites") endif () -set(libmagic_req 5.03) +set(libmagic_req 5.04) if ( LibMagic_VERSION VERSION_LESS ${libmagic_req} ) message(FATAL_ERROR "libmagic of at least version ${libmagic_req} required " "(found ${LibMagic_VERSION})") From 22a4113ac3e0a9c977fd51f429c385ba0f2ea1a2 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 28 May 2013 16:21:29 -0500 Subject: [PATCH 3/3] Dangling pointer fix. Addresses #1004. --- src/Sessions.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sessions.cc b/src/Sessions.cc index 2e5a6ded30..00f3bd539c 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -1159,12 +1159,12 @@ Connection* NetSessions::NewConn(HashKey* k, double t, const ConnID* id, if ( ! WantConnection(src_h, dst_h, tproto, flags, flip) ) return 0; + ConnID flip_id = *id; + if ( flip ) { // Make a guess that we're seeing the tail half of // an analyzable connection. - ConnID flip_id = *id; - const IPAddr ta = flip_id.src_addr; flip_id.src_addr = flip_id.dst_addr; flip_id.dst_addr = ta;