From c72192fd8105d24b21e3b089053418a145b74f71 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Tue, 3 Nov 2026 15:59:32 +0100
Subject: [PATCH] [Format] Small fixup (#7768)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Format] Small fixup.

* [CardDB] Stop leaking the loader's mutexes.

Both mutexes were heap-allocated through default member initializers and
never freed, so every CardDatabase destruction leaked 16 bytes. LeakSanitizer
flags this while discovering tests that create the database in main.

Hold them by value instead, as the loader is a QObject and therefore neither
copyable nor movable.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 .../libcockatrice/card/database/card_database_loader.cpp      | 4 ++--
 .../libcockatrice/card/database/card_database_loader.h        | 4 ++--
 .../libcockatrice/network/client/remote/remote_client.cpp     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
index 00b21f88e..7ca5ba433 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
@@ -83,7 +83,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabase(const QString &path, CardDatabas
     auto startTime = QTime::currentTime();
     LoadStatus tempLoadStatus = NotLoaded;
     if (!path.isEmpty()) {
-        QMutexLocker locker(loadFromFileMutex);
+        QMutexLocker locker(&loadFromFileMutex);
         tempLoadStatus = loadFromFile(path, data);
     }
 
@@ -102,7 +102,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabases(bool ignoreCache)
 
 LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache)
 {
-    QMutexLocker locker(reloadDatabaseMutex);
+    QMutexLocker locker(&reloadDatabaseMutex);
 
     if (!database) {
         qCWarning(CardDatabaseLoadingLog) << "Loader has no database pointer";
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
index bfbaa0f51..72aeeff3e 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
@@ -177,8 +177,8 @@ private:
     ICardSetPriorityController *priorityController; /**< Controller for reconstructing set state. */
     QList<ICardDatabaseParser *> availableParsers;  /**< List of available parsers for different formats. */
 
-    QBasicMutex *loadFromFileMutex = new QBasicMutex();   /**< Mutex for single-file loading. */
-    QBasicMutex *reloadDatabaseMutex = new QBasicMutex(); /**< Mutex for reloading entire database. */
+    QBasicMutex loadFromFileMutex;   /**< Mutex for single-file loading. */
+    QBasicMutex reloadDatabaseMutex; /**< Mutex for reloading entire database. */
 };
 
 #endif // COCKATRICE_CARD_DATABASE_LOADER_H
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
index df1413dd2..fa75e356a 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
@@ -173,8 +173,8 @@ void RemoteClient::processServerIdentificationEvent(const Event_ServerIdentifica
     // Quote the server-supplied strings in the log and limit their size.
     const QString serverName = QString::fromStdString(event.server_name()).left(256);
     const QString serverVersion = QString::fromStdString(event.server_version()).left(256);
-    qCInfo(RemoteClientLog) << "Server identification:" << serverName
-                            << "version" << serverVersion << "protocol version" << event.protocol_version();
+    qCInfo(RemoteClientLog) << "Server identification:" << serverName << "version" << serverVersion
+                            << "protocol version" << event.protocol_version();
     if (event.protocol_version() != protocolVersion) {
         emit protocolVersionMismatch(protocolVersion, event.protocol_version());
         setStatus(StatusDisconnecting);