Browse Source

Fix issue where CDataStream->nVersion was taken a CKeyPool record version

0.15
Jonas Schnelli 8 years ago
parent
commit
d0a627a53a
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
  1. 1
      src/wallet/wallet.cpp
  2. 13
      src/wallet/wallet.h

1
src/wallet/wallet.cpp

@ -3933,6 +3933,7 @@ bool CWallet::BackupWallet(const std::string& strDest)
CKeyPool::CKeyPool() CKeyPool::CKeyPool()
{ {
nTime = GetTime(); nTime = GetTime();
fInternal = false;
} }
CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool internalIn) CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool internalIn)

13
src/wallet/wallet.h

@ -114,14 +114,19 @@ public:
READWRITE(nVersion); READWRITE(nVersion);
READWRITE(nTime); READWRITE(nTime);
READWRITE(vchPubKey); READWRITE(vchPubKey);
if (nVersion >= FEATURE_HD_SPLIT) if (ser_action.ForRead()) {
try {
READWRITE(fInternal); READWRITE(fInternal);
else }
{ catch (...) {
if (ser_action.ForRead()) /* flag as external address if we can't read the internal boolean */
fInternal = false; fInternal = false;
} }
} }
else {
READWRITE(fInternal);
}
}
}; };
/** Address book data */ /** Address book data */

Loading…
Cancel
Save