Merge pull request Setasign#101 from Setasign/development

Handle streams with invisible content (white signs) and a length of 0.

src/PdfParser/Type/PdfStream.php

@@ -208,6 +208,13 @@ protected function extractStream()
             }
         }
 
+        // There are streams in the wild, which have only white signs in them but need to be parsed manually due
+        // to a problem encountered before (e.g. Length === 0). We should set them to empty streams to avoid problems
+        // in further processing (e.g. applying of filters).
+        if (trim($buffer) === '') {
+            $buffer = '';
+        }
+
         return $buffer;
     }
 

tests/functional/PdfParser/Type/PdfStreamTest.php

@@ -11,6 +11,7 @@
 use setasign\Fpdi\PdfParser\Type\PdfDictionary;
 use setasign\Fpdi\PdfParser\Type\PdfIndirectObject;
 use setasign\Fpdi\PdfParser\Type\PdfIndirectObjectReference;
+use setasign\Fpdi\PdfParser\Type\PdfName;
 use setasign\Fpdi\PdfParser\Type\PdfNull;
 use setasign\Fpdi\PdfParser\Type\PdfNumeric;
 use setasign\Fpdi\PdfParser\Type\PdfStream;
@@ -266,6 +267,27 @@ public function testParseWithZeroLength()
         $this->assertSame($streamContent, $result->getStream());
     }
 
+    public function testParseWithZeroLengthButAMixOfLinefeedAndCarrigeReturn()
+    {
+        $in = "stream\r"
+            . "\n"
+            . "\rendstream\r" // the inital \r in this line will be the content because of the \r\n | \r | \n logic to match the start of a content stream.
+            . "endobj";
+
+        $stream = StreamReader::createByString($in);
+
+        $stream->setOffset(6);
+        $this->assertSame("\r", $stream->getByte());
+
+        // Length of 0 - extract the stream manually
+        $dict = PdfDictionary::create(['Length' => PdfNumeric::create(0), 'Filter' => PdfName::create('FlateDecode')]);
+
+        $result = PdfStream::parse($dict, $stream);
+
+        $this->assertSame($dict, $result->value);
+        $this->assertSame('', $result->getStream());
+    }
+
     public function testParseWithEmptyStream()
     {
         $streamContent = "";