diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-12-06 13:07:21 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-12-06 13:07:25 -0500 |
commit | abae8aeff1cb3e501aa28e58d82254afc72c4e66 (patch) | |
tree | 5518f0980754997c94b2cce94763aed5e0683621 /src | |
parent | 8b8b3a9a5fd9d65d8ed0933352fad808327e0bf3 (diff) | |
parent | dcb032dcdf8e8300a84ae8ec6cfde0da5381f56f (diff) | |
download | bitcoin-abae8aeff1cb3e501aa28e58d82254afc72c4e66.tar.xz |
Merge #14880: 0.17: Backport #14453
dcb032dcdf qa: Ensure wallet unload during walletpassphrase timeout (João Barbosa)
75b5d8c4ea rpc: Fix wallet unload during walletpassphrase timeout (João Barbosa)
Pull request description:
Backport #14453 to 0.17
Tree-SHA512: fce0adccbb07b6635bb773a71beb4a9b814bceb77bbe7bbc5bcb7d151aabb1148c791622f58c990afe202012ca1971cd466cb536fc6f37e22cdc58738720b593
Diffstat (limited to 'src')
-rw-r--r-- | src/wallet/rpcwallet.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 6400b4470f..193da76551 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2546,13 +2546,6 @@ static UniValue keypoolrefill(const JSONRPCRequest& request) } -static void LockWallet(CWallet* pWallet) -{ - LOCK(pWallet->cs_wallet); - pWallet->nRelockTime = 0; - pWallet->Lock(); -} - static UniValue walletpassphrase(const JSONRPCRequest& request) { std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request); @@ -2622,7 +2615,18 @@ static UniValue walletpassphrase(const JSONRPCRequest& request) pwallet->TopUpKeyPool(); pwallet->nRelockTime = GetTime() + nSleepTime; - RPCRunLater(strprintf("lockwallet(%s)", pwallet->GetName()), std::bind(LockWallet, pwallet), nSleepTime); + + // Keep a weak pointer to the wallet so that it is possible to unload the + // wallet before the following callback is called. If a valid shared pointer + // is acquired in the callback then the wallet is still loaded. + std::weak_ptr<CWallet> weak_wallet = wallet; + RPCRunLater(strprintf("lockwallet(%s)", pwallet->GetName()), [weak_wallet] { + if (auto shared_wallet = weak_wallet.lock()) { + LOCK(shared_wallet->cs_wallet); + shared_wallet->Lock(); + shared_wallet->nRelockTime = 0; + } + }, nSleepTime); return NullUniValue; } |