Fix \mb_convert_encoding error handling

proget-hq · Sep 29, 2022 · 17c8532 · 17c8532
1 parent 2b8b619
commit 17c8532
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/VCardParser.php b/src/VCardParser.php
@@ -189,7 +189,7 @@ protected function parse()
                     } elseif (strpos(strtolower($type), 'charset=') === 0) {
                         try {
                             $value = mb_convert_encoding($value, "UTF-8", substr($type, 8));
-                        } catch (\Exception $e) {
+                        } catch (\Throwable $e) {
                         }
                         unset($types[$i]);
                     }

diff --git a/tests/VCardParserTest.php b/tests/VCardParserTest.php
@@ -295,4 +295,14 @@ public function testLabel()
         $parser = new VCardParser($vcard->buildVCard());
         $this->assertEquals($parser->getCardAtIndex(0)->label, $label);
     }
+
+    public function testInvalidEndingConversion()
+    {
+        $parser = VCardParser::parseFromFile(__DIR__ . '/invalid_encoding.vcf');
+
+        $cards = $parser->getCards();
+
+        $this->assertEquals($cards[0]->firstname, 'Jeroen');
+        $this->assertEquals($cards[0]->lastname, 'Desloovere');
+    }
 }
diff --git a/tests/invalid_encoding.vcf b/tests/invalid_encoding.vcf
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+REV:2016-05-30T10:36:13Z
+N;CHARSET=invalid-encoding:Desloovere;Jeroen;;;
+FN;CHARSET=utf-8:Jeroen Desloovere
+item1.EMAIL;type=INTERNET:[email protected]
+item1.X-ABLabel:$!<Email>!$
+item2.URL:http://www.jeroendesloovere.be
+item2.X-ABLabel:$!<Home>!$
+END:VCARD