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-08-18 15:34:29 +0200 |
| commit | 4b57c5b3c7f425a8cd122491c9dd69fe52dd3715 (patch) | |
| tree | ae6cf8bc1bd8e479a5e23b652c8e61a5227351a0 /src/wallet.h | |
| parent | f8cdf4f93704c3a123fa10b41efdc7e63cb5f1bf (diff) | |
| download | bitcoin-4b57c5b3c7f425a8cd122491c9dd69fe52dd3715.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.
Rebased-From: 18116b0
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 2d4b18dccd..095781e5df 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); |