From efa436974d8203485eec6faa1bf0116bb32f6fcd Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Mon, 30 Nov 2015 11:35:41 +0100
Subject: Linux/MacOSX: Implement Unicode passwords suppport. Make validation
 of parameters in GUI more robust.

---
 src/Main/Forms/VolumePasswordWizardPage.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/Main/Forms/VolumePasswordWizardPage.cpp')

diff --git a/src/Main/Forms/VolumePasswordWizardPage.cpp b/src/Main/Forms/VolumePasswordWizardPage.cpp
index f90f275c..d2fa48ad 100644
--- a/src/Main/Forms/VolumePasswordWizardPage.cpp
+++ b/src/Main/Forms/VolumePasswordWizardPage.cpp
@@ -35,9 +35,16 @@ namespace VeraCrypt
 		if (ConfirmationMode && !PasswordPanel->PasswordsMatch())
 			return false;
 
-		shared_ptr <KeyfileList> keyfiles (GetKeyfiles());
-		shared_ptr <VolumePassword> password (GetPassword());
-
-		return (password && !GetPassword()->IsEmpty()) || (keyfiles && !keyfiles->empty());
+		try
+		{
+			shared_ptr <KeyfileList> keyfiles (GetKeyfiles());
+			shared_ptr <VolumePassword> password (GetPassword());
+
+			return (password && !GetPassword()->IsEmpty()) || (keyfiles && !keyfiles->empty());
+		}
+		catch (PasswordException&)
+		{
+			return false;
+		}
 	}
 }
-- 
cgit v1.2.3