StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(core): extend RAII locker lifetime until end of function

Browse Source 
Before it was being constructed then destroyed immediately, not
actually keeping the mutex locked.
This commit is contained in:
Anthony Bilinski 2021-06-06 14:34:57 -07:00
parent 971b569716
commit 55fb28b08b
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/src/backend/alsink.cpp
View File

@ -30,7 +30,7 @@
AlSink::~AlSink()
{
QMutexLocker{&killLock};
QMutexLocker locker{&killLock};
// unsubscribe only if not already killed
if (!killed) {
@ -41,7 +41,7 @@ AlSink::~AlSink()
void AlSink::playAudioBuffer(const int16_t* data, int samples, unsigned channels, int sampleRate) const
{
QMutexLocker{&killLock};
QMutexLocker locker{&killLock};
if (killed) {
qCritical() << "Trying to play audio on an invalid sink";
@ -52,7 +52,7 @@ void AlSink::playAudioBuffer(const int16_t* data, int samples, unsigned channels
void AlSink::playMono16Sound(const IAudioSink::Sound& sound)
{
QMutexLocker{&killLock};
QMutexLocker locker{&killLock};
if (killed) {
qCritical() << "Trying to play sound on an invalid sink";
@ -63,7 +63,7 @@ void AlSink::playMono16Sound(const IAudioSink::Sound& sound)
void AlSink::startLoop()
{
QMutexLocker{&killLock};
QMutexLocker locker{&killLock};
if (killed) {
qCritical() << "Trying to start loop on an invalid sink";
@ -74,7 +74,7 @@ void AlSink::startLoop()
void AlSink::stopLoop()
{
QMutexLocker{&killLock};
QMutexLocker locker{&killLock};
if (killed) {
qCritical() << "Trying to stop loop on an invalid sink";
@ -105,7 +105,7 @@ AlSink::AlSink(OpenAL& al, uint sourceId)
AlSink::operator bool() const
{
QMutexLocker{&killLock};
QMutexLocker locker{&killLock};
return !killed;
}

4
audio/src/backend/alsource.cpp
View File

@ -34,7 +34,7 @@ AlSource::AlSource(OpenAL& al)
AlSource::~AlSource()
{
QMutexLocker{&killLock};
QMutexLocker locker{&killLock};
// unsubscribe only if not already killed
if (!killed) {
@ -45,7 +45,7 @@ AlSource::~AlSource()
AlSource::operator bool() const
{
QMutexLocker{&killLock};
QMutexLocker locker{&killLock};
return !killed;
}

16
src/core/corefile.cpp
View File

@ -91,7 +91,7 @@ void CoreFile::connectCallbacks(Tox &tox)
void CoreFile::sendAvatarFile(uint32_t friendId, const QByteArray& data)
{
QMutexLocker{coreLoopLock};
QMutexLocker locker{coreLoopLock};
uint64_t filesize = 0;
uint8_t *file_id = nullptr;
@ -145,7 +145,7 @@ void CoreFile::sendAvatarFile(uint32_t friendId, const QByteArray& data)
void CoreFile::sendFile(uint32_t friendId, QString filename, QString filePath,
long long filesize)
{
QMutexLocker{coreLoopLock};
QMutexLocker locker{coreLoopLock};
ToxString fileName(filename);
Tox_Err_File_Send sendErr;
@ -174,7 +174,7 @@ void CoreFile::sendFile(uint32_t friendId, QString filename, QString filePath,
void CoreFile::pauseResumeFile(uint32_t friendId, uint32_t fileId)
{
QMutexLocker{coreLoopLock};
QMutexLocker locker{coreLoopLock};
ToxFile* file = findFile(friendId, fileId);
if (!file) {
@ -208,7 +208,7 @@ void CoreFile::pauseResumeFile(uint32_t friendId, uint32_t fileId)
void CoreFile::cancelFileSend(uint32_t friendId, uint32_t fileId)
{
QMutexLocker{coreLoopLock};
QMutexLocker locker{coreLoopLock};
ToxFile* file = findFile(friendId, fileId);
if (!file) {
@ -224,7 +224,7 @@ void CoreFile::cancelFileSend(uint32_t friendId, uint32_t fileId)
void CoreFile::cancelFileRecv(uint32_t friendId, uint32_t fileId)
{
QMutexLocker{coreLoopLock};
QMutexLocker locker{coreLoopLock};
ToxFile* file = findFile(friendId, fileId);
if (!file) {
@ -239,7 +239,7 @@ void CoreFile::cancelFileRecv(uint32_t friendId, uint32_t fileId)
void CoreFile::rejectFileRecvRequest(uint32_t friendId, uint32_t fileId)
{
QMutexLocker{coreLoopLock};
QMutexLocker locker{coreLoopLock};
ToxFile* file = findFile(friendId, fileId);
if (!file) {
@ -254,7 +254,7 @@ void CoreFile::rejectFileRecvRequest(uint32_t friendId, uint32_t fileId)
void CoreFile::acceptFileRecvRequest(uint32_t friendId, uint32_t fileId, QString path)
{
QMutexLocker{coreLoopLock};
QMutexLocker locker{coreLoopLock};
ToxFile* file = findFile(friendId, fileId);
if (!file) {
@ -273,7 +273,7 @@ void CoreFile::acceptFileRecvRequest(uint32_t friendId, uint32_t fileId, QString
ToxFile* CoreFile::findFile(uint32_t friendId, uint32_t fileId)
{
QMutexLocker{coreLoopLock};
QMutexLocker locker{coreLoopLock};
uint64_t key = getFriendKey(friendId, fileId);
if (fileMap.contains(key)) {