Skip to content

Commit

Permalink
fix(preferences(js)): conditionally sanitize forward addresses
Browse files Browse the repository at this point in the history
Fixes #5085
  • Loading branch information
cgx committed Jul 16, 2020
1 parent e6e994b commit b78e66a
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions UI/WebServerResources/js/Preferences/PreferencesController.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b78e66a

Please sign in to comment.