extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-01-08 23:18:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle getSize errors in BlockFileIO::write

Browse Source 
getSize can return -1 if the file was deleted.
Just return an error to the user instead of
crashing in a segmentation fault.
This commit is contained in:
Jakob Unterwurzacher 2015-11-08 21:10:27 +01:00
parent deba6064ac
commit ed058fabcd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
encfs/BlockFileIO.cpp
View File

@ -178,6 +178,8 @@ bool BlockFileIO::write(const IORequest &req) {
rAssert(_blockSize != 0); rAssert(_blockSize != 0);
off_t fileSize = getSize(); off_t fileSize = getSize();
if (fileSize < 0)
return false;
// where write request begins // where write request begins
off_t blockNum = req.offset / _blockSize; off_t blockNum = req.offset / _blockSize;

4
encfs/RawFileIO.cpp
View File

@ -178,8 +178,10 @@ off_t RawFileIO::getSize() const {
const_cast<RawFileIO *>(this)->fileSize = stbuf.st_size; const_cast<RawFileIO *>(this)->fileSize = stbuf.st_size;
const_cast<RawFileIO *>(this)->knownSize = true; const_cast<RawFileIO *>(this)->knownSize = true;
return fileSize; return fileSize;
} else } else {
rError("getSize on %s failed: %s", name.c_str(), strerror(errno));
return -1; return -1;
}
} else { } else {
return fileSize; return fileSize;
} }