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

Merge pull request #4337 

88df548 base58: add paranoid return value checks (Jeff Garzik)
This commit is contained in:
Wladimir J. van der Laan 2014-06-16 17:29:35 +02:00
parent 0075337020 88df548dde
commit f73082db87
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/base58.cpp
View File

@ -114,9 +114,8 @@ std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn) {
} }
bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet) { bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet) {
if (!DecodeBase58(psz, vchRet)) if (!DecodeBase58(psz, vchRet) ||
return false; (vchRet.size() < 4))
if (vchRet.size() < 4)
{ {
vchRet.clear(); vchRet.clear();
return false; return false;
@ -154,8 +153,8 @@ void CBase58Data::SetData(const std::vector<unsigned char> &vchVersionIn, const
bool CBase58Data::SetString(const char* psz, unsigned int nVersionBytes) { bool CBase58Data::SetString(const char* psz, unsigned int nVersionBytes) {
std::vector<unsigned char> vchTemp; std::vector<unsigned char> vchTemp;
DecodeBase58Check(psz, vchTemp); bool rc58 = DecodeBase58Check(psz, vchTemp);
if (vchTemp.size() < nVersionBytes) { if ((!rc58) || (vchTemp.size() < nVersionBytes)) {
vchData.clear(); vchData.clear();
vchVersion.clear(); vchVersion.clear();
return false; return false;