mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug with accessing vchData[0] when vchData is empty.

Browse source 
Fix typo in CBase58Data::CompareTo
This commit is contained in:
Abraham Jewowich 2011-07-18 06:26:54 -07:00
parent cb61b8dc4c
commit 03f8b54565
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/base58.h
View file

@ -173,14 +173,16 @@ protected:
~CBase58Data() ~CBase58Data()
{ {
memset(&vchData[0], 0, vchData.size()); if (!vchData.empty())
memset(&vchData[0], 0, vchData.size());
} }
void SetData(int nVersionIn, const void* pdata, size_t nSize) void SetData(int nVersionIn, const void* pdata, size_t nSize)
{ {
nVersion = nVersionIn; nVersion = nVersionIn;
vchData.resize(nSize); vchData.resize(nSize);
memcpy(&vchData[0], pdata, nSize); if (!vchData.empty())
memcpy(&vchData[0], pdata, nSize);
} }
void SetData(int nVersionIn, const unsigned char *pbegin, const unsigned char *pend) void SetData(int nVersionIn, const unsigned char *pbegin, const unsigned char *pend)
@ -201,7 +203,8 @@ public:
} }
nVersion = vchTemp[0]; nVersion = vchTemp[0];
vchData.resize(vchTemp.size() - 1); vchData.resize(vchTemp.size() - 1);
memcpy(&vchData[0], &vchTemp[1], vchData.size()); if (!vchData.empty())
memcpy(&vchData[0], &vchTemp[1], vchData.size());
memset(&vchTemp[0], 0, vchTemp.size()); memset(&vchTemp[0], 0, vchTemp.size());
return true; return true;
} }
@ -221,7 +224,7 @@ public:
int CompareTo(const CBase58Data& b58) const int CompareTo(const CBase58Data& b58) const
{ {
if (nVersion < b58.nVersion) return -1; if (nVersion < b58.nVersion) return -1;
if (nVersion < b58.nVersion) return 1; if (nVersion > b58.nVersion) return 1;
if (vchData < b58.vchData) return -1; if (vchData < b58.vchData) return -1;
if (vchData > b58.vchData) return 1; if (vchData > b58.vchData) return 1;
return 0; return 0;