Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 00:39:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(YubiKey): call yk_release on errors

Browse Source 
Fix #2643 and #2721
This commit is contained in:
Johan Fleury 2019-02-27 21:18:20 -05:00 committed by Jonathan White
parent 010d44eab7
commit 0f1be60bda
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keys/drivers/YubiKey.cpp
View File

@ -77,6 +77,7 @@ bool YubiKey::init()
// TODO: handle multiple attached hardware devices // TODO: handle multiple attached hardware devices
m_yk_void = static_cast<void*>(yk_open_first_key()); m_yk_void = static_cast<void*>(yk_open_first_key());
if (m_yk == nullptr) { if (m_yk == nullptr) {
yk_release();
m_mutex.unlock(); m_mutex.unlock();
return false; return false;
} }
@ -85,6 +86,7 @@ bool YubiKey::init()
if (m_ykds == nullptr) { if (m_ykds == nullptr) {
yk_close_key(m_yk); yk_close_key(m_yk);
m_yk_void = nullptr; m_yk_void = nullptr;
yk_release();
m_mutex.unlock(); m_mutex.unlock();
return false; return false;
} }
@ -107,6 +109,8 @@ bool YubiKey::deinit()
m_ykds_void = nullptr; m_ykds_void = nullptr;
} }
yk_release();
m_mutex.unlock(); m_mutex.unlock();
return true; return true;