Merge pull request #188 from QualityUnit/patch-1

Fix empty utf8 quoted not parsed correctly #160
zbateson · Feb 22, 2022 · d42fe9a · d42fe9a
2 parents 038d504 + f2cc996
commit d42fe9a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Header/Part/MimeLiteralPart.php b/src/Header/Part/MimeLiteralPart.php
@@ -125,7 +125,7 @@ private function decodeMatchedEntity($matches)
      */
     private function decodeSplitPart($entity)
     {
-        if (preg_match('/^=\?([A-Za-z\-_0-9]+)\*?([A-Za-z\-_0-9]+)?\?([QBqb])\?([^\?]+)\?=$/', $entity, $matches)) {
+        if (preg_match('/^=\?([A-Za-z\-_0-9]+)\*?([A-Za-z\-_0-9]+)?\?([QBqb])\?([^\?]*)\?=$/', $entity, $matches)) {
             return $this->decodeMatchedEntity($matches);
         }
         $decoded = $this->convertEncoding($entity);

diff --git a/tests/MailMimeParser/Header/Part/MimeLiteralPartTest.php b/tests/MailMimeParser/Header/Part/MimeLiteralPartTest.php
@@ -47,6 +47,13 @@ public function testMimeEncoding()
         $this->assertDecoded('Kilgore Trout', '=?US-ASCII?Q?Kilgore_Trout?=');
     }
 
+    public function testDecodeEmpty()
+    {
+        $this->assertDecoded('', '=?US-ASCII?Q??=');
+        $this->assertDecoded('', '=?utf-8?Q??=');
+    }
+
+
     public function testMimeEncodingNullLanguage()
     {
         $part = $this->assertDecoded('Kilgore Trout', '=?US-ASCII?Q?Kilgore_Trout?=');