Catching and handling iconv decoding exception #397

Webklex · Jun 23, 2023 · 8ff2782 · 8ff2782
1 parent f1d82d9
commit 8ff2782
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - Protocol exception handling improved (bad response message added) #408
 - Prevent fetching singular rfc partials from running indefinitely #407
 - Subject with colon ";" is truncated #401
+- Catching and handling iconv decoding exception #397
 
 ### Added
 - NaN

diff --git a/src/Message.php b/src/Message.php
@@ -903,7 +903,11 @@ public function convertEncoding($str, string $from = "ISO-8859-2", string $to =
         }
 
         if (function_exists('iconv') && !EncodingAliases::isUtf7($from) && !EncodingAliases::isUtf7($to)) {
-            return @iconv($from, $to . '//IGNORE', $str);
+            try {
+                return iconv($from, $to.'//IGNORE', $str);
+            } catch (\Exception $e) {
+                return @iconv($from, $to, $str);
+            }
         } else {
             if (!$from) {
                 return mb_convert_encoding($str, $to);