Catch Idna_Exceptions.

horde · Feb 27, 2017 · 1c07a71 · 1c07a71
1 parent 3e187ef
commit 1c07a71
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -1275,12 +1275,12 @@ protected function _prepSendMessageEncode(Horde_Mail_Rfc822_List $email,
             /* $email contains address objects that already have the default
              * maildomain appended. Need to encode personal part and encode
              * IDN domain names. */
-            $tmp = $val->writeAddress(array(
-                'encode' => $charset,
-                'idn' => true
-            ));
-
             try {
+                $tmp = $val->writeAddress(array(
+                    'encode' => $charset,
+                    'idn' => true
+                ));
+
                 /* We have written address, but it still may not be valid.
                  * So double-check. */
                 $alist = IMP::parseAddressList($tmp, array(
@@ -1300,6 +1300,10 @@ protected function _prepSendMessageEncode(Horde_Mail_Rfc822_List $email,
                         $hook = false;
                     }
                 }
+            } catch (Horde_Idna_Exception $e) {
+                $error = array(
+                    'msg' => sprintf(_("Invalid e-mail address (%s): %s"), $val, $e->getMessage())
+                );
             } catch (Horde_Mail_Exception $e) {
                 $error = array(
                     'msg' => sprintf(_("Invalid e-mail address (%s)."), $val)