diff options
| author | Janne Juntunen <janne.juntunen@qt.io> | 2022-10-21 14:43:40 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-08 10:10:32 +0000 |
| commit | 40b882d1762bf75986b94e33a4752f637352e016 (patch) | |
| tree | fcfb823d7046eefc0c3ebd5ae1aed9404e852fb9 /src | |
| parent | 6c8b5ea8165473684fb21880d47472a99b7e4034 (diff) | |
Fix occasional segmentation fault when processing wireless networks
Disconnect signals from a service which is about to be deleted later,
so that it will not get added to the m_serviceModel list and become a
dangling pointer there later on.
Fixes: QTBUG-107561
Change-Id: Ifcd99bfacda8d4a932a93d10a94fa0e1613cbe98
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d0fa6b32b1fac0cab77bbee8d5dd6723028f3f2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index 4503f4d..36dddfe 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -260,11 +260,21 @@ void QNetworkSettingsManagerPrivate::onServicesChanged(ConnmanMapStructList chan emit q->servicesChanged(); if (auto service = m_unnamedServices.take(path)) - if (!service->placeholderState()) + if (!service->placeholderState()) { + disconnect(service, &QNetworkSettingsService::nameChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + disconnect(service, &QNetworkSettingsService::typeChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); service->deleteLater(); + } if (auto service = m_unknownServices.take(path)) - if (!service->placeholderState()) + if (!service->placeholderState()) { + disconnect(service, &QNetworkSettingsService::nameChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + disconnect(service, &QNetworkSettingsService::typeChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); service->deleteLater(); + } m_unnamedServicesForSsidConnection.remove(path); // do not delete here } |