Merge pull request #100 from Setasign/development

Throw explicit exception in case of invalid object type at xref offset.
Setasign · Mar 23, 2020 · 5277614 · 5277614
2 parents 368d7b8 + 2a20af4
commit 5277614
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/PdfParser/CrossReference/CrossReference.php b/src/PdfParser/CrossReference/CrossReference.php
@@ -235,8 +235,16 @@ protected function initReaderInstance($initValue)
         }
 
         if ($initValue instanceof PdfIndirectObject) {
-            // check for encryption
-            $stream = PdfStream::ensure($initValue->value);
+            try {
+                $stream = PdfStream::ensure($initValue->value);
+
+            } catch (PdfTypeException $e) {
+                throw new CrossReferenceException(
+                    'Invalid object type at xref reference offset.',
+                    CrossReferenceException::INVALID_DATA,
+                    $e
+                );
+            }
 
             $type = PdfDictionary::get($stream->value, 'Type');
             if ($type->value !== 'XRef') {

diff --git a/tests/functional/PdfParser/CrossReference/CrossReferenceTest.php b/tests/functional/PdfParser/CrossReference/CrossReferenceTest.php
@@ -597,4 +597,30 @@ public function testBehaviourWithHeaderOffsetWhichIsUsedInRealByteOffsets()
 
         $this->assertEquals(PdfIndirectObject::create(1, 0, PdfDictionary::create([])), $object);
     }
+
+    /**
+     * @expectedException \setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException
+     * @expectedExceptionCode \setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException::INVALID_DATA
+     */
+    public function testBehaviourWithWrongObjectTypeAttXrefOffset()
+    {
+        $pdf = "%PDF-1.7\n" .
+            "%\xE2\xE3\xCF\xD3\n" .
+            "1 0 obj\n" .
+            "<<>>" .
+            "xref\n" .
+            "0 2\r\n" .
+            "0000000000 65535 f\r\n" .
+            "0000000015 00000 n\r\n" .
+            "trailer\n" .
+            "<</Size 2 /Root 1 0 R>>\n" .
+            "startxref\n" .
+            "15\n" . //
+            "%%EOF";
+
+        $stream = StreamReader::createByString($pdf);
+        $parser = new PdfParser($stream);
+        $xref = new CrossReference($parser);
+        $xref->getTrailer();
+    }
 }