zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bad return values in LoadWallet.

This commit is contained in:
Matt Corallo 2011-07-14 18:15:50 +02:00
parent 24271c542b
commit 3a10d1c493
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db.cpp
View File

@ -777,7 +777,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
key.SetPrivKey(wkey.vchPrivKey); key.SetPrivKey(wkey.vchPrivKey);
} }
if (!pwallet->LoadKey(key)) if (!pwallet->LoadKey(key))
return false; return DB_CORRUPT;
} }
else if (strType == "mkey") else if (strType == "mkey")
{ {
@ -786,7 +786,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
CMasterKey kMasterKey; CMasterKey kMasterKey;
ssValue >> kMasterKey; ssValue >> kMasterKey;
if(pwallet->mapMasterKeys.count(nID) != 0) if(pwallet->mapMasterKeys.count(nID) != 0)
return false; return DB_CORRUPT;
pwallet->mapMasterKeys[nID] = kMasterKey; pwallet->mapMasterKeys[nID] = kMasterKey;
if (pwallet->nMasterKeyMaxID < nID) if (pwallet->nMasterKeyMaxID < nID)
pwallet->nMasterKeyMaxID = nID; pwallet->nMasterKeyMaxID = nID;
@ -798,7 +798,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
vector<unsigned char> vchPrivKey; vector<unsigned char> vchPrivKey;
ssValue >> vchPrivKey; ssValue >> vchPrivKey;
if (!pwallet->LoadCryptedKey(vchPubKey, vchPrivKey)) if (!pwallet->LoadCryptedKey(vchPubKey, vchPrivKey))
return false; return DB_CORRUPT;
} }
else if (strType == "defaultkey") else if (strType == "defaultkey")
{ {