From 9fff10fd5d3a92336be3e4bc4c257d84ca6a44c8 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 15 Mar 2023 17:56:56 +0100 Subject: [PATCH] Do not use QSharedPointer to store FileProviderSocketControllers, use QPointer Signed-off-by: Claudio Cambra --- src/gui/macOS/fileprovidersocketserver.cpp | 7 ++++++- src/gui/macOS/fileprovidersocketserver.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/macOS/fileprovidersocketserver.cpp b/src/gui/macOS/fileprovidersocketserver.cpp index 9a4dd4cf8..70b016157 100644 --- a/src/gui/macOS/fileprovidersocketserver.cpp +++ b/src/gui/macOS/fileprovidersocketserver.cpp @@ -71,7 +71,12 @@ void FileProviderSocketServer::slotNewConnection() void FileProviderSocketServer::slotSocketDestroyed(const QLocalSocket * const socket) { - _socketControllers.remove(socket); + const auto socketController = _socketControllers.take(socket); + + if (socketController) { + const auto rawSocketControllerPtr = socketController.data(); + delete rawSocketControllerPtr; + } } } // namespace Mac diff --git a/src/gui/macOS/fileprovidersocketserver.h b/src/gui/macOS/fileprovidersocketserver.h index ca58e2d1a..893de666e 100644 --- a/src/gui/macOS/fileprovidersocketserver.h +++ b/src/gui/macOS/fileprovidersocketserver.h @@ -22,7 +22,7 @@ namespace OCC { namespace Mac { class FileProviderSocketController; -using FileProviderSocketControllerPtr = QSharedPointer; +using FileProviderSocketControllerPtr = QPointer; QString fileProviderSocketPath(); -- 2.30.2