diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-10 09:42:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-12 15:28:41 +0200 |
| commit | 18116b06c177acb97ad1051a0d5da92251adf2dc (patch) | |
| tree | aa649517b36605d746f669962022f57d4d2f8901 /src/wallet.h | |
| parent | e5ee8f016ebb1db1bac3c4d0dd895249a4a17a1d (diff) | |
| download | bitcoin-18116b06c177acb97ad1051a0d5da92251adf2dc.tar.xz | |
Ignore too-long redeemScripts while loading wallet
This avoids that long redeemScripts that were grandfathered in
prevent the wallet from loading.
Fixes #4313.
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h index 274c31157c..7df656fc25 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -211,7 +211,7 @@ public: // Adds an encrypted key to the store, without saving it to disk (used by LoadWallet) bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret); bool AddCScript(const CScript& redeemScript); - bool LoadCScript(const CScript& redeemScript) { return CCryptoKeyStore::AddCScript(redeemScript); } + bool LoadCScript(const CScript& redeemScript); /// Adds a destination data tuple to the store, and saves it to disk bool AddDestData(const CTxDestination &dest, const std::string &key, const std::string &value); |