diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2014-06-11 23:20:37 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-18 15:34:29 +0200 |
| commit | f8cdf4f93704c3a123fa10b41efdc7e63cb5f1bf (patch) | |
| tree | 60fca1e255d207e16b0dd50cafeb124e0affcd4e | |
| parent | f6f4c83382665df656f3f0d8bcb55831a354d45c (diff) | |
| download | bitcoin-f8cdf4f93704c3a123fa10b41efdc7e63cb5f1bf.tar.xz | |
base58: add paranoid return value checks
Rebased-From: 88df548
| -rw-r--r-- | src/base58.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/base58.cpp b/src/base58.cpp index 5975703887..1bd64684e5 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -114,9 +114,8 @@ std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn) { } bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet) { - if (!DecodeBase58(psz, vchRet)) - return false; - if (vchRet.size() < 4) + if (!DecodeBase58(psz, vchRet) || + (vchRet.size() < 4)) { vchRet.clear(); 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) { std::vector<unsigned char> vchTemp; - DecodeBase58Check(psz, vchTemp); - if (vchTemp.size() < nVersionBytes) { + bool rc58 = DecodeBase58Check(psz, vchTemp); + if ((!rc58) || (vchTemp.size() < nVersionBytes)) { vchData.clear(); vchVersion.clear(); return false; |