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

throw an error if a node is smaller than expected in assemblystream 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2018-09-28 15:40:08 +02:00
parent 02de67773c
commit f1f74a39b6
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/dav/lib/Upload/AssemblyStream.php
View File

@ -57,6 +57,9 @@ class AssemblyStream implements \Icewind\Streams\File {
/** @var int */
private $currentNode = 0;
/** @var int */
private $currentNodeRead = 0;
/**
* @param string $path
* @param string $mode
@ -110,10 +113,16 @@ class AssemblyStream implements \Icewind\Streams\File {
do {
$data = fread($this->currentStream, $count);
$read = strlen($data);
$this->currentNodeRead += $read;
if (feof($this->currentStream)) {
fclose($this->currentStream);
$currentNodeSize = $this->nodes[$this->currentNode]->getSize();
if ($this->currentNodeRead < $currentNodeSize) {
throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
}
$this->currentNode++;
$this->currentNodeRead = 0;
if ($this->currentNode < count($this->nodes)) {
$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
} else {