Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kgpg: fix crash in case GPG initialization fails

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-03-15 22:13:22 +02:00
parent e4f880700a
commit 5f884bef8f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kgpg/kgpg.cpp
View file

@ -32,7 +32,7 @@
KGPG::KGPG(QWidget *parent)
: KMainWindow(parent),
m_mode(KGPG::EncryptMode),
m_release(false)
m_initialized(false)
{
m_ui.setupUi(this);
m_ui.startbutton->setEnabled(false);
@ -55,7 +55,7 @@ KGPG::KGPG(QWidget *parent)
setError(gpgme_strerror(gpgresult));
return;
}
m_release = true;
m_initialized = true;
gpgme_set_armor(m_gpgctx, 1); // if set at any point later (e.g. from setMode()) it has no effect
gpgme_set_offline(m_gpgctx, 1);
@ -67,7 +67,7 @@ KGPG::KGPG(QWidget *parent)
KGPG::~KGPG()
{
// will crash if not initialized
if (m_release) {
if (m_initialized) {
gpgme_release(m_gpgctx);
}
}
@ -527,6 +527,10 @@ void KGPG::slotQuit()
void KGPG::updateKeys(const gpgme_keylist_mode_t gpgmode, const bool gpgsecret)
{
if (!m_initialized) {
return;
}
disconnect(m_ui.keysbox, SIGNAL(currentIndexChanged(int)), this, SLOT(slotKeysBox(int)));
m_keys.clear();

2
kgpg/kgpg.h
View file

@ -82,7 +82,7 @@ private:
Ui_KGPGWindow m_ui;
KGPGMode m_mode;
bool m_release;
bool m_initialized;
gpgme_ctx_t m_gpgctx;
QList<KGPGKey> m_keys;