Skip to content

wallet: Avoid a segfault in migratewallet failure cleanup #26594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fanquake merged 3 commits into from
Dec 1, 2022
Merged

wallet: Avoid a segfault in migratewallet failure cleanup #26594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86ef7b3
wallet: Avoid null pointer deref when cleaning up migratewallet
achow101 Nov 28, 2022
88afc73
tests: Test for migrating encrypted wallets
achow101 Nov 28, 2022
5e65a21
wallet: Explicitly say migratewallet on encrypted wallets is unsupported
achow101 Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/wallet/rpc/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,9 @@ static RPCHelpMan migratewallet()
std::shared_ptr<CWallet> wallet = GetWalletForJSONRPCRequest(request);
if (!wallet) return NullUniValue;

EnsureWalletIsUnlocked(*wallet);
if (wallet->IsCrypted()) {
throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: migratewallet on encrypted wallets is currently unsupported.");
}

WalletContext& context = EnsureWalletContext(request.context);

Expand Down
4 changes: 2 additions & 2 deletions src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4093,8 +4093,8 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet>

// Make list of wallets to cleanup
std::vector<std::shared_ptr<CWallet>> created_wallets;
created_wallets.push_back(std::move(res.watchonly_wallet));
created_wallets.push_back(std::move(res.solvables_wallet));
if (res.watchonly_wallet) created_wallets.push_back(std::move(res.watchonly_wallet));
if (res.solvables_wallet) created_wallets.push_back(std::move(res.solvables_wallet));
Comment thread
achow101 marked this conversation as resolved.
Outdated

// Get the directories to remove after unloading
for (std::shared_ptr<CWallet>& w : created_wallets) {
Expand Down
10 changes: 10 additions & 0 deletions test/functional/wallet_migration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,15 @@ def test_pk_coinbases(self):

assert_equal(bals, wallet.getbalances())

def test_encrypted(self):
self.log.info("Test migration of an encrypted wallet")
wallet = self.create_legacy_wallet("encrypted")

wallet.encryptwallet("pass")

assert_raises_rpc_error(-15, "Error: migratewallet on encrypted wallets is currently unsupported.", wallet.migratewallet)
# TODO: Fix migratewallet so that we can actually migrate encrypted wallets

def run_test(self):
self.generate(self.nodes[0], 101)

Expand All @@ -402,6 +411,7 @@ def run_test(self):
self.test_other_watchonly()
self.test_no_privkeys()
self.test_pk_coinbases()
self.test_encrypted()

if __name__ == '__main__':
WalletMigrationTest().main()