BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1548 from TheBlueMatt/warnings 

Fix signed/unsigned warnings in {script,serialize}.h (fixes #1541)
This commit is contained in:
Jeff Garzik 2012-07-03 19:50:06 -07:00
parent da1103f4f8 467b79391f
commit 3ee48ba20a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/script.h
View File

@ -452,7 +452,7 @@ public:
memcpy(&nSize, &pc[0], 4); memcpy(&nSize, &pc[0], 4);
pc += 4; pc += 4;
} }
if (end() - pc < nSize) if (end() - pc < 0 || (unsigned int)(end() - pc) < nSize)
return false; return false;
if (pvchRet) if (pvchRet)
pvchRet->assign(pc, pc + nSize); pvchRet->assign(pc, pc + nSize);

9
src/serialize.h
View File

@ -809,7 +809,8 @@ public:
void insert(iterator it, const_iterator first, const_iterator last) void insert(iterator it, const_iterator first, const_iterator last)
{ {
if (it == vch.begin() + nReadPos && last - first <= nReadPos) assert(last - first >= 0);
if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
{ {
// special case for inserting at the front when there's room // special case for inserting at the front when there's room
nReadPos -= (last - first); nReadPos -= (last - first);
@ -821,7 +822,8 @@ public:
void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last) void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
{ {
if (it == vch.begin() + nReadPos && last - first <= nReadPos) assert(last - first >= 0);
if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
{ {
// special case for inserting at the front when there's room // special case for inserting at the front when there's room
nReadPos -= (last - first); nReadPos -= (last - first);
@ -834,7 +836,8 @@ public:
#if !defined(_MSC_VER) || _MSC_VER >= 1300 #if !defined(_MSC_VER) || _MSC_VER >= 1300
void insert(iterator it, const char* first, const char* last) void insert(iterator it, const char* first, const char* last)
{ {
if (it == vch.begin() + nReadPos && last - first <= nReadPos) assert(last - first >= 0);
if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
{ {
// special case for inserting at the front when there's room // special case for inserting at the front when there's room
nReadPos -= (last - first); nReadPos -= (last - first);