summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorAndre Heinecke <aheinecke@gnupg.org>2022-08-11 11:39:10 +0200
committerAndre Heinecke <aheinecke@gnupg.org>2022-08-11 11:39:10 +0200
commit586846209b08ce5e9545f53f21de884eb4079115 (patch)
treea36e98ca0619a4f7cca3bcfb11db87144e4096f5 /lang
parent7e2ef54b9c070bf9f4516828e34deae84b1425d3 (diff)
downloadgpgme-586846209b08ce5e9545f53f21de884eb4079115.tar.gz
Qt: Fix working with no gpgconf in CryptoConfig
* lang/qt/src/cryptoconfig.cpp (CryptoConfig::entry): Add nullptr checks. -- This fixes a crash when gpgconf is not found. When every return value is NULL. GnuPG-Bug-Id: T6131
Diffstat (limited to 'lang')
-rw-r--r--lang/qt/src/cryptoconfig.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/lang/qt/src/cryptoconfig.cpp b/lang/qt/src/cryptoconfig.cpp
index 4f13d3f0..fe808827 100644
--- a/lang/qt/src/cryptoconfig.cpp
+++ b/lang/qt/src/cryptoconfig.cpp
@@ -56,10 +56,11 @@ QVariant CryptoConfigEntry::defaultValue() const
QGpgME::CryptoConfigEntry *CryptoConfig::entry(const QString &componentName, const QString &entryName) const
{
const CryptoConfigComponent *comp = component(componentName);
- const QStringList groupNames = comp->groupList();
+ const QStringList groupNames = comp ? comp->groupList() : QStringList();
for (const auto &groupName : groupNames) {
- const CryptoConfigGroup *group = comp ? comp->group(groupName) : nullptr;
- if (CryptoConfigEntry *entry = group->entry(entryName)) {
+ const CryptoConfigGroup *group = comp->group(groupName);
+ CryptoConfigEntry *entry = group ? group->entry(entryName) : nullptr;
+ if (entry) {
return entry;
}
}