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 minor TOTP issues

Browse Source 
* Fix #5105 - prevent divide-by-zero segfault due to invalid TOTP settings
* Clear TOTP settings if attributes are removed
This commit is contained in:
Jonathan White 2020-07-16 18:45:30 -04:00
parent 747be8d629
commit d6857e654f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Entry.cpp
View File

@ -481,6 +481,8 @@ void Entry::updateTotp()
m_attributes->value(Totp::ATTRIBUTE_SEED)); m_attributes->value(Totp::ATTRIBUTE_SEED));
} else if (m_attributes->contains(Totp::ATTRIBUTE_OTP)) { } else if (m_attributes->contains(Totp::ATTRIBUTE_OTP)) {
m_data.totpSettings = Totp::parseSettings(m_attributes->value(Totp::ATTRIBUTE_OTP)); m_data.totpSettings = Totp::parseSettings(m_attributes->value(Totp::ATTRIBUTE_OTP));
} else {
m_data.totpSettings.reset();
} }
} }

2
src/totp/totp.cpp
View File

@ -113,7 +113,7 @@ QSharedPointer<Totp::Settings> Totp::parseSettings(const QString& rawSettings, c
} }
// Bound digits and step // Bound digits and step
settings->digits = qMax(1u, settings->digits); settings->digits = qBound(1u, settings->digits, 10u);
settings->step = qBound(1u, settings->step, 60u); settings->step = qBound(1u, settings->step, 60u);
// Detect custom settings, used by setup GUI // Detect custom settings, used by setup GUI