From b12e203572844c14d9a025a1300be5e22668ba87 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 9 Feb 2020 15:54:23 +0100 Subject: [PATCH] Fix some smally memory leaks reported by valgrind --- libnymea-core/cloud/cloudmanager.cpp | 2 +- libnymea-core/networkmanager/wirednetworkdevice.h | 4 ++-- libnymea-core/networkmanager/wirelessnetworkdevice.h | 2 +- plugins/mock/devicepluginmock.cpp | 1 + plugins/mock/devicepluginmock.h | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libnymea-core/cloud/cloudmanager.cpp b/libnymea-core/cloud/cloudmanager.cpp index 683dc091..97bec86a 100644 --- a/libnymea-core/cloud/cloudmanager.cpp +++ b/libnymea-core/cloud/cloudmanager.cpp @@ -60,7 +60,7 @@ CloudManager::CloudManager(NymeaConfiguration *configuration, NetworkManager *ne config.id = "remote"; config.authenticationEnabled = false; config.sslEnabled = true; - m_transport = new CloudTransport(config); + m_transport = new CloudTransport(config, this); connect(m_awsConnector, &AWSConnector::proxyConnectionRequestReceived, m_transport, &CloudTransport::connectToCloud); m_deviceId = m_configuration->serverUuid(); diff --git a/libnymea-core/networkmanager/wirednetworkdevice.h b/libnymea-core/networkmanager/wirednetworkdevice.h index 3146578d..46c44a39 100644 --- a/libnymea-core/networkmanager/wirednetworkdevice.h +++ b/libnymea-core/networkmanager/wirednetworkdevice.h @@ -58,8 +58,8 @@ private: QDBusInterface *m_wiredInterface; QString m_macAddress; - int m_bitRate; - bool m_pluggedIn; + int m_bitRate = 0; + bool m_pluggedIn = false; void setMacAddress(const QString &macAddress); void setBitRate(const int &bitRate); diff --git a/libnymea-core/networkmanager/wirelessnetworkdevice.h b/libnymea-core/networkmanager/wirelessnetworkdevice.h index df45c328..ecc919cf 100644 --- a/libnymea-core/networkmanager/wirelessnetworkdevice.h +++ b/libnymea-core/networkmanager/wirelessnetworkdevice.h @@ -74,7 +74,7 @@ private: QDBusInterface *m_wirelessInterface; QString m_macAddress; - int m_bitRate; + int m_bitRate = 0; WirelessAccessPoint *m_activeAccessPoint; QDBusObjectPath m_activeAccessPointObjectPath; diff --git a/plugins/mock/devicepluginmock.cpp b/plugins/mock/devicepluginmock.cpp index bfebe583..feb44072 100644 --- a/plugins/mock/devicepluginmock.cpp +++ b/plugins/mock/devicepluginmock.cpp @@ -78,6 +78,7 @@ DevicePluginMock::DevicePluginMock() DevicePluginMock::~DevicePluginMock() { + delete m_virtualFs; } void DevicePluginMock::discoverDevices(DeviceDiscoveryInfo *info) diff --git a/plugins/mock/devicepluginmock.h b/plugins/mock/devicepluginmock.h index 3e0184e2..0e370668 100644 --- a/plugins/mock/devicepluginmock.h +++ b/plugins/mock/devicepluginmock.h @@ -86,6 +86,7 @@ private: class VirtualFsNode { public: VirtualFsNode(const BrowserItem &item):item(item) {} + ~VirtualFsNode() { while (!childs.isEmpty()) delete childs.takeFirst(); } BrowserItem item; QList childs; void addChild(VirtualFsNode* child) {childs.append(child); }