GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt: Fix working with no gpgconf in CryptoConfig

Browse Source 
* 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
This commit is contained in:
Andre Heinecke 2022-08-11 11:39:10 +02:00
parent 7e2ef54b9c
commit 586846209b
No known key found for this signature in database
GPG Key ID: EF20562ABF3290E6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lang/qt/src/cryptoconfig.cpp
View File

@ -56,10 +56,11 @@ QVariant CryptoConfigEntry::defaultValue() const
QGpgME::CryptoConfigEntry *CryptoConfig::entry(const QString &componentName, const QString &entryName) const QGpgME::CryptoConfigEntry *CryptoConfig::entry(const QString &componentName, const QString &entryName) const
{ {
const CryptoConfigComponent *comp = component(componentName); const CryptoConfigComponent *comp = component(componentName);
const QStringList groupNames = comp->groupList(); const QStringList groupNames = comp ? comp->groupList() : QStringList();
for (const auto &groupName : groupNames) { for (const auto &groupName : groupNames) {
const CryptoConfigGroup *group = comp ? comp->group(groupName) : nullptr; const CryptoConfigGroup *group = comp->group(groupName);
if (CryptoConfigEntry *entry = group->entry(entryName)) { CryptoConfigEntry *entry = group ? group->entry(entryName) : nullptr;
if (entry) {
return entry; return entry;
} }
} }