gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-06-12 19:11:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10577

Browse Source 
9a18697 wallet: roll back unlocker count on decrypt failure (fuyua9)
This commit is contained in:
tobtoht
2026-05-19 19:55:47 +00:00
parent b745be7235 9a18697518
commit 521a9b4c82
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet2.cpp
+12 -2
View File
@@ -1121,10 +1121,20 @@ wallet_keys_unlocker::wallet_keys_unlocker(wallet2 &w, const epee::wipeable_stri
w.generate_chacha_key_from_password(*password, key);
boost::lock_guard<boost::mutex> lock(lockers_lock);
if (lockers_per_wallet[std::addressof(w)]++ > 0)
wallet2* w_ptr = std::addressof(w);
if (lockers_per_wallet[w_ptr]++ > 0)
return;
w.decrypt_keys(key);
try
{
w.decrypt_keys(key);
}
catch (...)
{
if (--lockers_per_wallet[w_ptr] == 0)
lockers_per_wallet.erase(w_ptr);
throw;
}
}
wallet_keys_unlocker::~wallet_keys_unlocker()