Skip to content

Gracefully handle only newlines between stream markers #376

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
PrinsFrank merged 1 commit into from
May 30, 2026
Merged

Gracefully handle only newlines between stream markers #376

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
6 changes: 3 additions & 3 deletions src/Document/Object/Item/UncompressedObject/UncompressedObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,16 @@ public function getEncryptionContext(): ?EncryptionContext {
public function getContent(Document $document): Stream {
if (($startStreamPos = $document->stream->getStartNextLineAfter(Marker::STREAM, $this->startOffset, $this->endOffset)) !== null
&& ($endStreamPos = $document->stream->lastPos(Marker::END_STREAM, $document->stream->getSizeInBytes() - $this->endOffset)) !== null) {
if ($startStreamPos === $endStreamPos) {
if ($startStreamPos === $endStreamPos
|| $startStreamPos === ($eolEndStreamPos = $document->stream->getEndOfCurrentLine($endStreamPos - 1, $this->endOffset))) {
return new InMemoryStream('');
}

return CompressedObjectContentParser::parseBinary(
$this->getEncryptionContext(),
$document,
$startStreamPos,
($document->stream->getEndOfCurrentLine($endStreamPos - 1, $this->endOffset)
?? throw new ParseFailureException(sprintf('Unable to locate marker %s', WhitespaceCharacter::LINE_FEED->value))) - $startStreamPos,
($eolEndStreamPos ?? throw new ParseFailureException(sprintf('Unable to locate marker %s', WhitespaceCharacter::LINE_FEED->value))) - $startStreamPos,
$this->getDictionary($document),
);
}
Expand Down
Loading