Skip to content

Added check for false of StreamReader::readBytes() to avoid PHP warning #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 30, 2025
Merged

Added check for false of StreamReader::readBytes() to avoid PHP warning #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
555d095
Added check for false of readBytes() to avoid PHP warning
JanSlabon Jun 27, 2025
1e106ba
Added test to reproduce issue 235
JanSlabon Jun 27, 2025
ce266f8
Fixed @throws doc-block annotation
JanSlabon Jun 30, 2025
ec1f3ee
Fixed @throws doc-block annotation
JanSlabon Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/PdfParser/CrossReference/AbstractReader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ abstract class AbstractReader
*
* @param PdfParser $parser
* @throws CrossReferenceException
* @throws PdfTypeException
*/
public function __construct(PdfParser $parser)
{
Expand All @@ -57,7 +56,6 @@ public function getTrailer()
* Read the trailer dictionary.
*
* @throws CrossReferenceException
* @throws PdfTypeException
*/
protected function readTrailer()
{
Expand Down
2 changes: 1 addition & 1 deletion src/PdfParser/CrossReference/FixedReader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function getOffsetFor($objectNumber)
$position = $offset + 20 * ($objectNumber - $startObject);
$this->reader->ensure($position, 20);
$line = $this->reader->readBytes(20);
if ($line[17] === 'f') {
if ($line === false || $line[17] === 'f') {
return false;
}

Expand Down
15 changes: 15 additions & 0 deletions tests/functional/PdfParser/CrossReference/FixedReaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,21 @@ public function testGetOffset($table, $expectedOffsets)
}
}

public function testGetOffsetWhileStreamWasReset()
{
$table = "0 2\n" .
"0000000000 65535 f \n" .
"0000001000 00000 n \n" .
"trailer<</Size 2>>";

$reader = StreamReader::createByString($table);
$xref = new FixedReader(new PdfParser($reader));
$stream = $reader->getStream();
\ftruncate($stream, 40);

$this->assertFalse($xref->getOffsetFor(1));
}

/**
* @throws CrossReferenceException
*/
Expand Down