mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

encrypted filesize calculation in flush()

This commit is contained in:
jknockaert 2015-05-20 09:35:20 +02:00 committed by Bjoern Schiessle
parent aae9274210
commit fb51880a4a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/files/stream/encryption.php
View File

@ -412,7 +412,14 @@ class Encryption extends Wrapper {
$encrypted = $this->encryptionModule->encrypt($this->cache);
parent::stream_write($encrypted);
$this->writeFlag = false;
$this->size = max($this->size, parent::stream_tell());
// If the write concerns the last block then then update the encrypted filesize
// Note that the unencrypted pointer and filesize are NOT yet updated when flush() is called
// We recalculate the encrypted filesize as we do not know the context of calling flush()
if ((int)floor($this->unencryptedSize/$this->unencryptedBlockSize) === (int)floor($this->position/$this->unencryptedBlockSize)) {
$this->size = $this->util->getBlockSize() * (int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
$this->size += strlen($encrypted);
$this->size += $this->headerSize;
}
}
// always empty the cache (otherwise readCache() will not fill it with the new block)
$this->cache = '';