VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-21 07:41:46 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2326 from srcejon/fix_1734

Browse Source 
ADS-B: Fix memory use after delete.
This commit is contained in:
Edouard Griffiths 2024-11-12 20:23:35 +01:00 committed by GitHub
commit bba9d0b421
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/demodadsb/adsbdemod.cpp
View File

@ -105,8 +105,8 @@ ADSBDemod::~ADSBDemod()
delete m_networkManager; delete m_networkManager;
m_deviceAPI->removeChannelSinkAPI(this); m_deviceAPI->removeChannelSinkAPI(this);
m_deviceAPI->removeChannelSink(this); m_deviceAPI->removeChannelSink(this);
delete m_basebandSink; // This results in a call to ADSBDemod::stop(), so need to delete before worker and thread
delete m_worker; delete m_worker;
delete m_basebandSink;
delete m_thread; delete m_thread;
} }

1
plugins/channelrx/demodadsb/adsbdemodgui.cpp
View File

@ -5113,6 +5113,7 @@ ADSBDemodGUI::ADSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
ADSBDemodGUI::~ADSBDemodGUI() ADSBDemodGUI::~ADSBDemodGUI()
{ {
m_adsbDemod->setMessageQueueToGUI(nullptr);
disconnect(&MainCore::instance()->getSettings(), &MainSettings::preferenceChanged, this, &ADSBDemodGUI::preferenceChanged); disconnect(&MainCore::instance()->getSettings(), &MainSettings::preferenceChanged, this, &ADSBDemodGUI::preferenceChanged);
if (m_templateServer) if (m_templateServer)
{ {