wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #15973

Browse source 
Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code.
This commit is contained in:
jknockaert 2015-04-30 17:10:18 +02:00
parent 41d7870d7b
commit f5415653fd
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/files/stream/encryption.php
View file

@ -356,24 +356,22 @@ class Encryption extends Wrapper {
switch ($whence) {
case SEEK_SET:
if ($offset < $this->unencryptedSize && $offset >= 0) {
$newPosition = $offset;
}
break;
case SEEK_CUR:
if ($offset >= 0) {
$newPosition = $offset + $this->position;
}
$newPosition = $this->position + $offset;
break;
case SEEK_END:
if ($this->unencryptedSize + $offset >= 0) {
$newPosition = $this->unencryptedSize + $offset;
}
break;
default:
return $return;
}
if ($newPosition > $this->unencryptedSize || $newPosition < 0) {
return $return;
}
$newFilePosition = floor($newPosition / $this->unencryptedBlockSize)
* $this->util->getBlockSize() + $this->headerSize;