Merge pull request #4962

6f3ae9b Fixing out of bounds error in GetKey() (ENikS)
This commit is contained in:
Wladimir J. van der Laan 2014-09-23 10:52:49 +02:00
commit bfe527ea86
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -288,7 +288,8 @@ void CBitcoinSecret::SetKey(const CKey& vchSecret)
CKey CBitcoinSecret::GetKey()
{
CKey ret;
ret.Set(&vchData[0], &vchData[32], vchData.size() > 32 && vchData[32] == 1);
assert(vchData.size() >= 32);
ret.Set(vchData.begin(), vchData.begin() + 32, vchData.size() > 32 && vchData[32] == 1);
return ret;
}