upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 02:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #11555 from nextcloud/backport/11435/stable14

Browse source 
throw an error if a node is smaller than expected in assemblystream
This commit is contained in:
Roeland Jago Douma 2018-10-02 21:37:27 +02:00 committed by GitHub
commit 5d0946aaa5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 {