Merge branch 'MDL-78253' of https://github.com/paulholden/moodle

mod/assign/feedback/editpdf/fpdi/Fpdi.php

@@ -29,7 +29,7 @@ class Fpdi extends FpdfTpl
      *
      * @string
      */
-    const VERSION = '2.3.6';
+    const VERSION = '2.3.7';
 
     protected function _enddoc()
     {

mod/assign/feedback/editpdf/fpdi/PdfParser/CrossReference/FixedReader.php

@@ -58,6 +58,7 @@ class FixedReader extends AbstractReader implements ReaderInterface
 
     /**
      * @inheritdoc
+     * @return int|false
      */
     public function getOffsetFor($objectNumber)
     {

mod/assign/feedback/editpdf/fpdi/PdfParser/CrossReference/LineReader.php

@@ -42,6 +42,7 @@ class LineReader extends AbstractReader implements ReaderInterface
 
     /**
      * @inheritdoc
+     * @return int|false
      */
     public function getOffsetFor($objectNumber)
     {

mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/Lzw.php

@@ -87,37 +87,28 @@ class Lzw implements FilterInterface
         $this->nextData = 0;
         $this->nextBits = 0;
 
-        $oldCode = 0;
+        $prevCode = 0;
 
         $uncompData = '';
 
         while (($code = $this->getNextCode()) !== 257) {
             if ($code === 256) {
                 $this->initsTable();
-                $code = $this->getNextCode();
-
-                if ($code === 257) {
-                    break;
-                }
-
+            } elseif ($prevCode === 256) {
                 $uncompData .= $this->sTable[$code];
-                $oldCode = $code;
+            } elseif ($code < $this->tIdx) {
+                $string = $this->sTable[$code];
+                $uncompData .= $string;
+
+                $this->addStringToTable($this->sTable[$prevCode], $string[0]);
             } else {
-                if ($code < $this->tIdx) {
-                    $string = $this->sTable[$code];
-                    $uncompData .= $string;
+                $string = $this->sTable[$prevCode];
+                $string .= $string[0];
+                $uncompData .= $string;
 
-                    $this->addStringToTable($this->sTable[$oldCode], $string[0]);
-                    $oldCode = $code;
-                } else {
-                    $string = $this->sTable[$oldCode];
-                    $string .= $string[0];
-                    $uncompData .= $string;
-
-                    $this->addStringToTable($string);
-                    $oldCode = $code;
-                }
+                $this->addStringToTable($string);
             }
+            $prevCode = $code;
         }
 
         return $uncompData;
@@ -163,7 +154,7 @@ class Lzw implements FilterInterface
     /**
      * Returns the next 9, 10, 11 or 12 bits.
      *
-     * @return integer
+     * @return int
      */
     protected function getNextCode()
     {

mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfStream.php

@@ -46,9 +46,8 @@ class PdfStream extends PdfType
 
         // Find the first "newline"
         while (($firstByte = $reader->getByte($offset)) !== false) {
-            if ($firstByte !== "\n" && $firstByte !== "\r") {
-                $offset++;
-            } else {
+            $offset++;
+            if ($firstByte === "\n" || $firstByte === "\r") {
                 break;
             }
         }
@@ -60,11 +59,7 @@ class PdfStream extends PdfType
             );
         }
 
-        $sndByte = $reader->getByte($offset + 1);
-        if ($firstByte === "\n" || $firstByte === "\r") {
-            $offset++;
-        }
-
+        $sndByte = $reader->getByte($offset);
         if ($sndByte === "\n" && $firstByte !== "\n") {
             $offset++;
         }

mod/assign/feedback/editpdf/fpdi/PdfReader/PdfReader.php

@@ -202,7 +202,8 @@ class PdfReader
             return;
         }
 
-        $readPages = function ($kids, $count) use (&$readPages, $readAll) {
+        $expectedPageCount = $this->getPageCount();
+        $readPages = function ($kids, $count) use (&$readPages, $readAll, $expectedPageCount) {
             $kids = PdfArray::ensure($kids);
             $isLeaf = ($count->value === \count($kids->value));
 
@@ -222,6 +223,11 @@ class PdfReader
                 } else {
                     $this->pages[] = $object;
                 }
+
+                // stop if all pages are read - faulty documents exists with additional entries with invalid data.
+                if (count($this->pages) === $expectedPageCount) {
+                    break;
+                }
             }
         };
 

mod/assign/feedback/editpdf/fpdi/Tcpdf/Fpdi.php

@@ -42,7 +42,7 @@ class Fpdi extends \pdf
      *
      * @string
      */
-    const VERSION = '2.3.6';
+    const VERSION = '2.3.7';
 
     /**
      * A counter for template ids.
@@ -140,6 +140,7 @@ class Fpdi extends \pdf
 
     /**
      * @inheritdoc
+     * @return string
      */
     protected function _getxobjectdict()
     {

mod/assign/feedback/editpdf/fpdi/Tfpdf/Fpdi.php

@@ -30,7 +30,7 @@ class Fpdi extends FpdfTpl
      *
      * @string
      */
-    const VERSION = '2.3.6';
+    const VERSION = '2.3.7';
 
     public function _enddoc()
     {

mod/assign/feedback/editpdf/thirdpartylibs.xml

@@ -4,7 +4,7 @@
     <location>fpdi</location>
     <name>FPDI</name>
     <description>Collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF.</description>
-    <version>2.3.6</version>
+    <version>2.3.7</version>
     <license>MIT</license>
     <repository>https://github.com/Setasign/FPDI</repository>
     <copyrights>