mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 04:45:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6958 from nextcloud/bugfix/preventCrashOnEncryptShellIntegrationRequests

Browse source 
prevent event loop reentrance when handling ENCRYPT socket requests
This commit is contained in:
Matthieu Gallien 2024-08-07 12:17:00 +02:00 committed by GitHub
commit 5ed29db71d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gui/socketapi/socketapi.cpp
View file

@ -444,6 +444,13 @@ void SocketApi::slotReadSocket()
<< "with argument:" << argument;
socketApiJob->failure(QStringLiteral("command not found"));
}
} else if (command.startsWith("ENCRYPT")) {
if (indexOfMethod != -1) {
ASSERT(thread() == QThread::currentThread())
staticMetaObject.method(indexOfMethod)
.invoke(this, Qt::QueuedConnection, Q_ARG(QString, argument.toString()),
Q_ARG(SocketListener *, listener.data()));
}
} else {
if (indexOfMethod != -1) {
// to ensure that listener is still valid we need to call it with Qt::DirectConnection