LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Refactor: make the read function simpler

Browse source
This commit is contained in:
gnuser 2017-09-02 22:41:25 -07:00
parent acb11535cb
commit 9db9d6215f
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/streams.h
View file

@ -345,18 +345,16 @@ public:
// Read from the beginning of the buffer // Read from the beginning of the buffer
unsigned int nReadPosNext = nReadPos + nSize; unsigned int nReadPosNext = nReadPos + nSize;
if (nReadPosNext >= vch.size()) if (nReadPosNext > vch.size()) {
{
if (nReadPosNext > vch.size())
{
throw std::ios_base::failure("CDataStream::read(): end of data"); throw std::ios_base::failure("CDataStream::read(): end of data");
} }
memcpy(pch, &vch[nReadPos], nSize); memcpy(pch, &vch[nReadPos], nSize);
if (nReadPosNext == vch.size())
{
nReadPos = 0; nReadPos = 0;
vch.clear(); vch.clear();
return; return;
} }
memcpy(pch, &vch[nReadPos], nSize);
nReadPos = nReadPosNext; nReadPos = nReadPosNext;
} }