diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-18 17:27:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-18 17:34:20 +0200 |
| commit | 088240685456494a26047c8f3d5ecf578f70dbce (patch) | |
| tree | 015ff371e02a935c181375e65e849dc666a63f69 /src/wallet/wallet.h | |
| parent | ac3224c8eea9cacba23fea3a4f22a0375485dce7 (diff) | |
| parent | faa18ca046e9043b2cf68cb1bd17cc8c60fe26d9 (diff) | |
| download | bitcoin-088240685456494a26047c8f3d5ecf578f70dbce.tar.xz | |
Merge #13437: wallet: Erase wtxOrderd wtx pointer on removeprunedfunds
faa18ca046e9043b2cf68cb1bd17cc8c60fe26d9 wallet: Erase wtxOrderd wtx pointer on removeprunedfunds (MarcoFalke)
Pull request description:
This prevents segfaults, when reading from the freed memory.
Tree-SHA512: 04f8190dea7901cf1cc298d5db98c83b02858f27114c5ef4da738accd176d6647d6b81f3dc39f3d5912b1a981cf0599370fd391c4154ffbde97afc1fac389123
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 1ec2a9e771..aacbdf81d6 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -339,6 +339,7 @@ public: char fFromMe; std::string strFromAccount; int64_t nOrderPos; //!< position in ordered transaction list + std::multimap<int64_t, std::pair<CWalletTx*, CAccountingEntry*>>::const_iterator m_it_wtxOrdered; // memory only mutable bool fDebitCached; |