Fixed bugs: packet manager does not keep a reference to the filter (and can thus outlive it); packet managers not cleared when session is cleared

Author: azonenberg

release-notes/v0.1-rc2.md

@@ -3,6 +3,7 @@
 This should be very close to the final v0.1 release.
 
 Known bugs:
+* Heap use-after-free during file load of UART decode (https://github.com/ngscopeclient/scopehal-apps/issues/876, fixed in git HEAD)
 * MacOS binary packaging is not finished (https://github.com/ngscopeclient/scopehal-apps/issues/743)
 * Application icon is not finished (https://github.com/ngscopeclient/scopehal-apps/issues/204)
 * Docking anchors act funny on MacOS (https://github.com/ngscopeclient/scopehal-apps/issues/871)

src/ngscopeclient/PacketManager.cpp

@@ -46,7 +46,7 @@ PacketManager::PacketManager(PacketDecoder* pd, Session& session)
 	, m_filter(pd)
 	, m_refreshPending(false)
 {
-
+	m_filter->AddRef();
 }
 
 PacketManager::~PacketManager()
@@ -61,6 +61,8 @@ PacketManager::~PacketManager()
 	}
 	m_packets.clear();
 	m_childPackets.clear();
+
+	m_filter->Release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/ngscopeclient/Session.cpp

@@ -182,6 +182,9 @@ void Session::Clear()
 
 	lock_guard<shared_mutex> lock(m_waveformDataMutex);
 
+	//Clear packet managers before removing filters (since they can hold references to them)
+	m_packetmgrs.clear();
+
 	/**
 		HACK: for now, export filters keep an open reference to themselves to avoid memory leaks