Merge pull request #4962

6f3ae9b Fixing out of bounds error in GetKey() (ENikS)
2014-09-23 10:52:49 +02:00 · 2014-09-23 10:52:49 +02:00 · bfe527ea86
parent 2027450d42 6f3ae9b5df
commit bfe527ea86
1 changed files with 2 additions and 1 deletions
--- a/src/base58.cpp
+++ b/src/base58.cpp
@ -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;
 }