diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2025-12-10 11:25:19 +0200 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2025-12-10 17:24:57 +0200 |
| commit | 7633a041b9f26e0a86722b101f924125d4a2f65e (patch) | |
| tree | 5f679bf9d94a065c19fe28a130959dfc6d825da7 | |
| parent | 925c94d5b6d8ce8acd9502c8407ab2493e677ba7 (diff) | |
Add null protection to QMailServiceConfiguration::id() and service()
Shouldn't crash using these with null configuration.
Everything else is already protected.
Change-Id: I1d56995764e57260c61c450ee486daf84b4968f7
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: Damien Caliste <dcaliste@free.fr>
| -rw-r--r-- | src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp b/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp index 52820065..4b9ecee4 100644 --- a/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp +++ b/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp @@ -106,7 +106,7 @@ QMailServiceConfiguration::~QMailServiceConfiguration() */ QString QMailServiceConfiguration::service() const { - return _config->service(); + return _config ? _config->service() : QString(); } /*! @@ -114,7 +114,7 @@ QString QMailServiceConfiguration::service() const */ QMailAccountId QMailServiceConfiguration::id() const { - return _config->id(); + return _config ? _config->id() : QMailAccountId(); } /*! @@ -171,7 +171,7 @@ void QMailServiceConfiguration::setType(ServiceType type) */ bool QMailServiceConfiguration::isValid() const { - return (_config != 0); + return _config != nullptr; } /*! |