Skip to content

Optimized support for ignoring faulty structures in page tree #165

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 1 commit into from
Feb 9, 2023
Merged

Optimized support for ignoring faulty structures in page tree #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion src/PdfReader/PdfReader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ protected function readPages($readAll = false)
return;
}

$readPages = function ($kids, $count) use (&$readPages, $readAll) {
$expectedPageCount = $this->getPageCount();
$readPages = function ($kids, $count) use (&$readPages, $readAll, $expectedPageCount) {
$kids = PdfArray::ensure($kids);
$isLeaf = ($count->value === \count($kids->value));

Expand All @@ -222,6 +223,11 @@ protected function readPages($readAll = false)
} else {
$this->pages[] = $object;
}

// stop if all pages are read - faulty documents exists with additional entries with invalid data.
if (count($this->pages) === $expectedPageCount) {
break;
}
}
};

Expand Down
Binary file added tests/_files/pdfs/specials/page-trees/PageTreeWithInvalidTypeAndMisslLeadingCount.pdf
View file
Open in desktop
Binary file not shown.
26 changes: 26 additions & 0 deletions tests/functional/PdfReader/PdfReaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ public function getPageCountProvider()
13
];

$data[] = [
$path . '/specials/page-trees/PageTreeWithInvalidTypeAndMisslLeadingCount.pdf',
1
];

return $data;
}

Expand Down Expand Up @@ -835,6 +840,27 @@ public function getPageProvider()
]
];

$data[] = [
$path . '/specials/page-trees/PageTreeWithInvalidTypeAndMisslLeadingCount.pdf',
[
1 => PdfIndirectObject::create(
1,
0,
PdfDictionary::create([
'Type' => PdfName::create('Page'),
'MediaBox' => PdfArray::create([
PdfNumeric::create(0),
PdfNumeric::create(0),
PdfNumeric::create(595.28),
PdfNumeric::create(841.89)
]),
'Resources' => PdfDictionary::create(),
'Parent' => PdfIndirectObjectReference::create(3, 0),
])
)
]
];

return $data;
}

Expand Down