[Libreoffice-commits] core.git: svl/source

[Michael Stahl (via logerrit)]

 svl/source/passwordcontainer/passwordcontainer.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bbb8617ece6d946957c2eb96287081029bce530f
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri May 6 12:21:50 2022 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri May 6 15:24:25 2022 +0200

    svl: fix crash if user cancels/closes master password dialog
    
    (regression from d7ba5614d90381d68f880ca7e7c5ef8bbb1b1c43)
    
    Change-Id: I8bb9a967aefa2e88f05c23456a0dd1a090e1a5fb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133932
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx 
b/svl/source/passwordcontainer/passwordcontainer.cxx
index 9dd1b7eb7ebb..0abddc2d6b13 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -1104,8 +1104,10 @@ sal_Bool SAL_CALL 
PasswordContainer::authorizateWithMasterPassword( const uno::R
                 do {
                     aPass = RequestPasswordFromUser( aRMode, xTmpHandler );
 
-                    if (m_xStorageFile->getStorageVersion() == 0)
+                    if (!aPass.isEmpty() && 
m_xStorageFile->getStorageVersion() == 0)
+                    {
                         aPass = ReencodeAsOldHash(aPass);
+                    }
 
                     bResult = ( !aPass.isEmpty() && aPass == m_aMasterPassword 
);
                     aRMode = PasswordRequestMode_PASSWORD_REENTER; // further 
questions with error notification