highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-30 02:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6906

Browse Source 
30d9662 Reject invalid pubkeys when reading ckey items from the wallet. (Gregory Maxwell)
This commit is contained in:
Wladimir J. van der Laan
2015-10-31 00:39:45 +01:00
parent d482c0a7b2 30d9662bd7
commit 48b5b84ee5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/walletdb.cpp
View File

@ -512,8 +512,13 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
} }
else if (strType == "ckey") else if (strType == "ckey")
{ {
vector<unsigned char> vchPubKey; CPubKey vchPubKey;
ssKey >> vchPubKey; ssKey >> vchPubKey;
if (!vchPubKey.IsValid())
{
strErr = "Error reading wallet database: CPubKey corrupt";
return false;
}
vector<unsigned char> vchPrivKey; vector<unsigned char> vchPrivKey;
ssValue >> vchPrivKey; ssValue >> vchPrivKey;
wss.nCKeys++; wss.nCKeys++;