Merge pull request #6981 from nextcloud/backport/6958/stable-3.12

[stable-3.12] prevent event loop reentrance when handling ENCRYPT socket requests
nextcloud · Aug 8, 2024 · 827f57c · 827f57c
2 parents 7fc2378 + 585c4d5
commit 827f57c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
@@ -428,6 +428,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