From b78e66a10b470cf1db99378f8de6e5d6ff1e73c3 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 16 Jul 2020 15:05:42 -0400
Subject: [PATCH] fix(preferences(js)): conditionally sanitize forward
 addresses

Fixes #5085
---
 .../js/Preferences/PreferencesController.js      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index 1d51e7bfc..d2183fa17 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -387,14 +387,16 @@
       // We do some sanity checks
 
       // We check if we're allowed or not to forward based on the domain defaults
-      addresses = this.preferences.defaults.Forward.forwardAddress;
-      try {
-        for (i = 0; i < addresses.length; i++) {
-          validateForwardAddress(addresses[i]);
+      if (this.preferences.defaults.Forward && this.preferences.defaults.Forward.forwardAddress) {
+        addresses = this.preferences.defaults.Forward.forwardAddress;
+        try {
+          for (i = 0; i < addresses.length; i++) {
+            validateForwardAddress(addresses[i]);
+          }
+        } catch (err) {
+          Dialog.alert(l('Error'), err);
+          sendForm = false;
         }
-      } catch (err) {
-        Dialog.alert(l('Error'), err);
-        sendForm = false;
       }
 
       // IMAP labels must be unique