zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #4357 - oxarbitrage:issue2880, r=daira 

Add null check to feof

Closes https://github.com/zcash/zcash/issues/2880
This commit is contained in:
Homu 2020-09-03 18:51:37 +00:00
parent cf8cd09ae1 fb8dd9d458
commit af6ca1406c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/streams.h
View File

@ -524,16 +524,17 @@ private:
protected:
// read data from the source to fill the buffer
bool Fill() {
assert(nReadPos == nSrcPos);
unsigned int pos = nSrcPos % vchBuf.size();
unsigned int readNow = vchBuf.size() - pos;
unsigned int nAvail = vchBuf.size() - (nSrcPos - nReadPos) - nRewind;
unsigned int nAvail = vchBuf.size() - nRewind;
if (nAvail < readNow)
readNow = nAvail;
if (readNow == 0)
return false;
size_t nBytes = fread((void*)&vchBuf[pos], 1, readNow, src);
if (nBytes == 0) {
throw std::ios_base::failure(feof(src) ? "CBufferedFile::Fill: end of file" : "CBufferedFile::Fill: fread failed");
throw std::ios_base::failure(eof() ? "CBufferedFile::Fill: end of file" : "CBufferedFile::Fill: fread failed");
}
nSrcPos += nBytes;
return true;
@ -566,7 +567,7 @@ public:
// check whether we're at the end of the source file
bool eof() const {
return nReadPos == nSrcPos && feof(src);
return src == NULL || (nReadPos == nSrcPos && feof(src));
}
// read a number of bytes