Skip to content

fix: support multi-space object headers (PR800 stack) #30

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
vitormattos merged 1 commit into from
Apr 25, 2026
Merged

fix: support multi-space object headers (PR800 stack) #30

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
Binary file added samples/bugs/rawdata/PullRequestNearbyObjectHeaderOffset.pdf
View file
Open in desktop
Binary file not shown.
27 changes: 23 additions & 4 deletions src/Smalot/PdfParser/RawData/RawDataParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ protected function decodeXrefStream(string $pdfData, int $startxref, array $xref
protected function getObjectHeaderPattern(array $objRefs): string
{
// consider all whitespace character (PDF specifications)
return '/'.$objRefs[0].$this->config->getPdfWhitespacesRegex().$objRefs[1].$this->config->getPdfWhitespacesRegex().'obj/';
return '/'.$objRefs[0].$this->config->getPdfWhitespacesRegex().'+'.$objRefs[1].$this->config->getPdfWhitespacesRegex().'+obj/';
}

protected function getObjectHeaderLen(array $objRefs): int
Expand Down Expand Up @@ -567,6 +567,7 @@ protected function getIndirectObject(string $pdfData, array $xref, string $objRe
throw new \Exception('Invalid object reference for $obj.');
}

$objHeaderPattern = $this->getObjectHeaderPattern($objRefArr);
$objHeaderLen = $this->getObjectHeaderLen($objRefArr);

/*
Expand All @@ -576,9 +577,27 @@ protected function getIndirectObject(string $pdfData, array $xref, string $objRe
$offset += strspn($pdfData, $this->config->getPdfWhitespaces(), $offset);
// ignore leading zeros for object number
$offset += strspn($pdfData, '0', $offset);
if (0 == preg_match($this->getObjectHeaderPattern($objRefArr), substr($pdfData, $offset, $objHeaderLen))) {
// an indirect reference to an undefined object shall be considered a reference to the null object
return ['null', 'null', $offset];
if (0 == preg_match($objHeaderPattern, substr($pdfData, $offset, 33), $headerMatches)) {
// Some malformed files have slightly inaccurate xref offsets.
// Try to recover by locating the expected object header nearby.
$searchStart = max(0, $offset - 64);
$searchLen = 192;
if (
preg_match(
$objHeaderPattern,
substr($pdfData, $searchStart, $searchLen),
$headerMatches,
\PREG_OFFSET_CAPTURE
) > 0
) {
$offset = $searchStart + $headerMatches[0][1];
$objHeaderLen = \strlen($headerMatches[0][0]);
} else {
// an indirect reference to an undefined object shall be considered a reference to the null object
return ['null', 'null', $offset];
}
} else {
$objHeaderLen = \strlen($headerMatches[0]);
}

/*
Expand Down
3 changes: 3 additions & 0 deletions tests/PHPUnit/Integration/RawData/RawDataParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@ public static function provideRawDataRegressionFixtures(): iterable
yield 'pr799 xref subsection with multiple spaces' => [
'rawdata/PullRequestXrefSubsectionMultipleSpaces.pdf',
];
yield 'pr800 object header with multiple spaces (nearby xref offset)' => [
'rawdata/PullRequestNearbyObjectHeaderOffset.pdf',
];
}

/**
Expand Down
Loading