extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-12-28 01:29:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check the assertions in cacheReadOneBlock explicitely

Browse Source 
...to make the code more robust w.r.t. refactoring.

Also add comments about the last block handling.
This commit is contained in:
Jakob Unterwurzacher 2014-11-17 20:13:03 +01:00
parent 6d895fdc72
commit 9f9e30a73f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
encfs/BlockFileIO.cpp
View File

@ -55,12 +55,17 @@ BlockFileIO::~BlockFileIO() {
* returned data as neccessary.
*/
ssize_t BlockFileIO::cacheReadOneBlock(const IORequest &req) const {
// we can satisfy the request even if _cache.dataLen is too short, because
// we always request a full block during reads..
rAssert(req.dataLen <= _blockSize);
rAssert(req.offset % _blockSize == 0);
/* we can satisfy the request even if _cache.dataLen is too short, because
* we always request a full block during reads. This just means we are
* in the last block of a file, which may be smaller than the blocksize. */
if ((req.offset == _cache.offset) && (_cache.dataLen != 0)) {
// satisfy request from cache
int len = req.dataLen;
if (_cache.dataLen < len) len = _cache.dataLen;
if (_cache.dataLen < len) len = _cache.dataLen; // Don't read past EOF
memcpy(req.data, _cache.data, len);
return len;
} else {