From 5c9970c7867dd151ee7766cabe647a916663cd67 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Sun, 27 Mar 2016 09:16:30 -0400 Subject: [PATCH 1/2] delete packet if not saved --- Streaming.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Streaming.cpp b/Streaming.cpp index 33be58b5..8c11a889 100644 --- a/Streaming.cpp +++ b/Streaming.cpp @@ -162,7 +162,9 @@ namespace stream void Stream::SavePacket (Packet * packet) { - m_SavedPackets.insert (packet); + auto ins = m_SavedPackets.insert (packet); + // delete packed if not saved + if (!ins.second) delete packet; } void Stream::ProcessPacket (Packet * packet) From 0a3c4f131e16ea2e44b826ddd3ab9fec13f7a680 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Mon, 28 Mar 2016 17:15:27 -0400 Subject: [PATCH 2/2] fix issue #449 failed build of freebsd 10.1 --- Log.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Log.h b/Log.h index ebb73a12..33bd5868 100644 --- a/Log.h +++ b/Log.h @@ -140,7 +140,7 @@ namespace log { LogLevel level; /**< message level */ std::thread::id tid; /**< id of thread that generated message */ - LogMsg (LogLevel lvl, std::time_t ts, const std::string & txt): timestamp(ts), text(txt), level(lvl), tid(0) {}; + LogMsg (LogLevel lvl, std::time_t ts, const std::string & txt): timestamp(ts), text(txt), level(lvl) {}; }; Log & Logger();