Use byte offset next in use object to start search for end of current object to allow for "endobj" markers to appear in embedded files

src/Document/CrossReference/Source/CrossReferenceSource.php

@@ -75,4 +75,26 @@ public function getFirstId(): string {
 
         return $firstId;
     }
+
+    public function getByteOffsetNextInUseObject(CrossReferenceEntryInUseObject $crossReferenceEntry): ?int {
+        $byteOffsets = [];
+        foreach ($this->crossReferenceSections as $crossReferenceSection) {
+            foreach ($crossReferenceSection->crossReferenceSubSections as $crossReferenceSubSection) {
+                foreach ($crossReferenceSubSection->crossReferenceEntries as $entry) {
+                    if ($entry instanceof CrossReferenceEntryInUseObject) {
+                        $byteOffsets[] = $entry->byteOffsetInDecodedStream;
+                    }
+                }
+            }
+        }
+
+        sort($byteOffsets);
+        foreach ($byteOffsets as $byteOffset) {
+            if ($byteOffset > $crossReferenceEntry->byteOffsetInDecodedStream) {
+                return $byteOffset;
+            }
+        }
+
+        return null;
+    }
 }

src/Document/Document.php

@@ -123,7 +123,7 @@ public function getObject(int $objectNumber, ?string $expectedDecoratorFQN = nul
 
             $objectItem = $parentObject->objectItem->getCompressedObject($objectNumber, $this);
         } else {
-            $objectItem = UncompressedObjectParser::parseObject($crossReferenceEntry, $objectNumber, $this->stream);
+            $objectItem = UncompressedObjectParser::parseObject($crossReferenceEntry, $this->crossReferenceSource->getByteOffsetNextInUseObject($crossReferenceEntry), $objectNumber, $this->stream);
         }
 
         return $this->objectCache[$objectNumber] = DecoratedObjectFactory::forItem($objectItem, $this, $expectedDecoratorFQN);

src/Document/Object/Item/UncompressedObject/UncompressedObjectParser.php

@@ -10,8 +10,13 @@
 
 /** @internal */
 class UncompressedObjectParser {
-    public static function parseObject(CrossReferenceEntryInUseObject $crossReferenceEntry, int $objectNumber, Stream $stream): UncompressedObject {
-        $endObj = $stream->firstPos(Marker::END_OBJ, $crossReferenceEntry->byteOffsetInDecodedStream, $stream->getSizeInBytes()) ?? throw new ParseFailureException('Unable to locate end of object');
+    public static function parseObject(CrossReferenceEntryInUseObject $crossReferenceEntry, ?int $byteOffsetNextInUseObject, int $objectNumber, Stream $stream): UncompressedObject {
+        if ($byteOffsetNextInUseObject !== null) {
+            $endObj = $stream->lastPos(Marker::END_OBJ, $stream->getSizeInBytes() - $byteOffsetNextInUseObject) ?? throw new ParseFailureException('Unable to locate end of object');
+        } else {
+            $endObj = $stream->firstPos(Marker::END_OBJ, $crossReferenceEntry->byteOffsetInDecodedStream, $stream->getSizeInBytes()) ?? throw new ParseFailureException('Unable to locate end of object');
+        }
+
         $startObj = $stream->firstPos(Marker::OBJ, $crossReferenceEntry->byteOffsetInDecodedStream, $endObj) ?? throw new ParseFailureException('Unable to locate start of object');
         $objHeader = $stream->read($crossReferenceEntry->byteOffsetInDecodedStream, $startObj + Marker::OBJ->length() - $crossReferenceEntry->byteOffsetInDecodedStream);
         $objHeaderParts = explode(WhitespaceCharacter::SPACE->value, str_replace([WhitespaceCharacter::LINE_FEED->value], ' ', trim($objHeader)));