diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-05-06 12:21:50 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-05-06 15:24:25 +0200 |
| commit | bbb8617ece6d946957c2eb96287081029bce530f (patch) | |
| tree | 2e78bf80a6e6e7d67dfa41ae45ee2ca01af42a80 | |
| parent | 9ca44e925a8e06e0946fa9e7bd80cfdbfbb83c62 (diff) | |
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.stahl@allotropia.de>
| -rw-r--r-- | svl/source/passwordcontainer/passwordcontainer.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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 |