Skip to content

Commit f6f8d54

Browse files
committed
Merge #10920: [qt] Fix potential memory leak in newPossibleKey(ChangeCWallet *wallet)
446e261 [qt] Fix potential memory leak in newPossibleKey(ChangeCWallet *wallet) (practicalswift) Pull request description: Fix potential memory leak in `newPossibleKey(ChangeCWallet *wallet)`. Tree-SHA512: 252d3828133a0d241cc649aed1280e14a5d5ea47b7b2989039cfa5061a8e35183c7f36d7320aa0ac1b4dcab31e584b358dbbb2fe645a412371d0a460878e2b58
2 parents 4122112 + 446e261 commit f6f8d54

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/qt/walletmodeltransaction.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &_recipients) :
1111
recipients(_recipients),
1212
walletTransaction(0),
13-
keyChange(0),
1413
fee(0)
1514
{
1615
walletTransaction = new CWalletTx();
1716
}
1817

1918
WalletModelTransaction::~WalletModelTransaction()
2019
{
21-
delete keyChange;
2220
delete walletTransaction;
2321
}
2422

@@ -91,10 +89,10 @@ CAmount WalletModelTransaction::getTotalTransactionAmount() const
9189

9290
void WalletModelTransaction::newPossibleKeyChange(CWallet *wallet)
9391
{
94-
keyChange = new CReserveKey(wallet);
92+
keyChange.reset(new CReserveKey(wallet));
9593
}
9694

9795
CReserveKey *WalletModelTransaction::getPossibleKeyChange()
9896
{
99-
return keyChange;
97+
return keyChange.get();
10098
}

src/qt/walletmodeltransaction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class WalletModelTransaction
4040
private:
4141
QList<SendCoinsRecipient> recipients;
4242
CWalletTx *walletTransaction;
43-
CReserveKey *keyChange;
43+
std::unique_ptr<CReserveKey> keyChange;
4444
CAmount fee;
4545
};
4646

0 commit comments

Comments
 (0)