flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #134 Fix double free crash on exit

Browse Source 
The destructor of CThreadedTonePairPlayer was called twice:
- after the local stack-variable of CSelcalPlayer got out of scope.
- again as part of the CContinuousWorker/DeferredDelete
This commit is contained in:
Lars Toenning
2022-01-13 22:58:55 +01:00
committed by Mat Sutcliffe
parent 154a1c803f
commit 594f589a64
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blacksound/selcalplayer.cpp
View File

@@ -18,9 +18,9 @@ namespace BlackSound
{ {
CSelcalPlayer::CSelcalPlayer(const CAudioDeviceInfo &device, QObject *parent) CSelcalPlayer::CSelcalPlayer(const CAudioDeviceInfo &device, QObject *parent)
: QObject(parent), : QObject(parent),
m_threadedPlayer(this, "CSelcalPlayer", device) m_threadedPlayer(new CThreadedTonePairPlayer(this, "CSelcalPlayer", device))
{ {
m_threadedPlayer.start(); m_threadedPlayer->start();
} }
CSelcalPlayer::~CSelcalPlayer() CSelcalPlayer::~CSelcalPlayer()
@@ -30,7 +30,7 @@ namespace BlackSound
void CSelcalPlayer::gracefulShutdown() void CSelcalPlayer::gracefulShutdown()
{ {
m_threadedPlayer.quitAndWait(); m_threadedPlayer->quitAndWait();
} }
CTime CSelcalPlayer::play(int volume, const CSelcal &selcal) CTime CSelcalPlayer::play(int volume, const CSelcal &selcal)
@@ -46,7 +46,7 @@ namespace BlackSound
const CTonePair t3(frequencies.at(2), frequencies.at(3), oneSec); const CTonePair t3(frequencies.at(2), frequencies.at(3), oneSec);
QList<CTonePair> tonePairs; QList<CTonePair> tonePairs;
tonePairs << t1 << t2 << t3; tonePairs << t1 << t2 << t3;
m_threadedPlayer.play(volume, tonePairs); m_threadedPlayer->play(volume, tonePairs);
duration = oneSec * 2.5; duration = oneSec * 2.5;
} }
return duration; return duration;

2
src/blacksound/selcalplayer.h
View File

@@ -40,7 +40,7 @@ namespace BlackSound
BlackMisc::PhysicalQuantities::CTime play(int volume, const BlackMisc::Aviation::CSelcal &selcal); BlackMisc::PhysicalQuantities::CTime play(int volume, const BlackMisc::Aviation::CSelcal &selcal);
private: private:
CThreadedTonePairPlayer m_threadedPlayer; CThreadedTonePairPlayer *m_threadedPlayer = nullptr;
}; };
} }