Development

.github/workflows/release.yml

@@ -2,7 +2,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version'
+        description: 'Version (x.x.x)'
         required: true
 
 name: Create release

src/FpdiTrait.php

@@ -172,7 +172,8 @@ protected function getPdfReaderId(
             );
         }
 
-        /** @noinspection OffsetOperationsInspection */
+        $id = \md5($id . '|' . \print_r($parserParams, true));
+
         if (isset($this->readers[$id])) {
             return $id;
         }
@@ -187,7 +188,6 @@ protected function getPdfReaderId(
         }
 
         $reader = new PdfReader($this->getPdfParserInstance($streamReader, $parserParams));
-        /** @noinspection OffsetOperationsInspection */
         $this->readers[$id] = $reader;
 
         return $id;

src/PdfParser/CrossReference/CrossReference.php

@@ -56,6 +56,9 @@ class CrossReference
      */
     public function __construct(PdfParser $parser, $fileHeaderOffset = 0)
     {
+        // clear the token stack, if the parser instance is re-used
+        $parser->getTokenizer()->clearStack();
+
         $this->parser = $parser;
         $this->fileHeaderOffset = $fileHeaderOffset;
 

tests/functional/FpdiTraitTest.php

@@ -4,6 +4,8 @@
 
 use PHPUnit\Framework\TestCase;
 use setasign\Fpdi\Fpdi;
+use setasign\Fpdi\FpdiTrait;
+use setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException;
 use setasign\Fpdi\PdfParser\Type\PdfArray;
 use setasign\Fpdi\PdfParser\Type\PdfBoolean;
 use setasign\Fpdi\PdfParser\Type\PdfDictionary;
@@ -16,7 +18,6 @@
 use setasign\Fpdi\PdfParser\Type\PdfStream;
 use setasign\Fpdi\PdfParser\Type\PdfString;
 use setasign\Fpdi\PdfParser\Type\PdfToken;
-use setasign\Fpdi\PdfParser\Type\PdfType;
 
 class FpdiTraitTest extends TestCase
 {
@@ -359,6 +360,43 @@ public function testWritingOfIndirectObjectsAndReferences()
             "endobj\n",
             $result
         );
+    }
+
+    public function testSetSourceFileCalledTwiceWithEncryptedDocument()
+    {
+        $path = __DIR__ . '/../_files/pdfs/encrypted/AES256-R6-u=user-o=owner.pdf';
+        $pdf = new Fpdi();
+        $this->expectException(CrossReferenceException::class);
+        $this->expectExceptionCode(CrossReferenceException::ENCRYPTED);
+
+        try {
+            $pdf->setSourceFile($path);
+        } catch (\Throwable $e) {
+            $pdf->setSourceFileWithParserParams($path, ['password' => 'neverUsed']);
+        }
+    }
 
+    public function testInternalReaderIdBehavior()
+    {
+        $class = new class() {
+            use FpdiTrait;
+
+            public function debugGetPdfReaderId($file, array $parserParams = [])
+            {
+                return $this->getPdfReaderId($file, $parserParams);
+            }
+        };
+
+        $a = $class->debugGetPdfReaderId(__FILE__, []);
+        $b = $class->debugGetPdfReaderId(__FILE__, []);
+        $this->assertSame($a, $b);
+
+        $c = $class->debugGetPdfReaderId(__FILE__, ['a']);
+        $this->assertNotSame($b, $c);
+        $d = $class->debugGetPdfReaderId(__FILE__, ['b']);
+        $this->assertNotSame($c, $d);
+
+        $e = $class->debugGetPdfReaderId(__DIR__ . '/../_files/pdfs/normal-xref.pdf', ['b']);
+        $this->assertNotSame($d, $e);
     }
 }