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:
parent
02de67773c
commit
f1f74a39b6
|
@ -57,6 +57,9 @@ class AssemblyStream implements \Icewind\Streams\File {
|
||||||
/** @var int */
|
/** @var int */
|
||||||
private $currentNode = 0;
|
private $currentNode = 0;
|
||||||
|
|
||||||
|
/** @var int */
|
||||||
|
private $currentNodeRead = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $path
|
* @param string $path
|
||||||
* @param string $mode
|
* @param string $mode
|
||||||
|
@ -110,10 +113,16 @@ class AssemblyStream implements \Icewind\Streams\File {
|
||||||
do {
|
do {
|
||||||
$data = fread($this->currentStream, $count);
|
$data = fread($this->currentStream, $count);
|
||||||
$read = strlen($data);
|
$read = strlen($data);
|
||||||
|
$this->currentNodeRead += $read;
|
||||||
|
|
||||||
if (feof($this->currentStream)) {
|
if (feof($this->currentStream)) {
|
||||||
fclose($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->currentNode++;
|
||||||
|
$this->currentNodeRead = 0;
|
||||||
if ($this->currentNode < count($this->nodes)) {
|
if ($this->currentNode < count($this->nodes)) {
|
||||||
$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
|
$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue