Fix possible deadlock during log setup

The mutex is supposed to ensure the order of messages if threads are involved, allow multiple locks from the same thread.
owncloud · Jun 1, 2023 · e6d0be9 · e6d0be9
1 parent 9eaa7d0
commit e6d0be9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog/unreleased/10905 b/changelog/unreleased/10905
@@ -0,0 +1,5 @@
+Bugfix: Possible deadlock during log setup
+
+If an error occured during the setup of the log file, it was possible that the client got deadlocked.
+
+https://github.com/owncloud/client/pull/10905
diff --git a/src/libsync/logger.h b/src/libsync/logger.h
@@ -96,7 +96,7 @@ class OWNCLOUDSYNC_EXPORT Logger : public QObject
     bool _doFileFlush = false;
     bool _logDebug = false;
     QScopedPointer<QTextStream> _logstream;
-    mutable QMutex _mutex;
+    mutable QRecursiveMutex _mutex;
     QString _logDirectory;
     bool _temporaryFolderLogDir = false;
     QSet<QString> _logRules;