diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-05-06 12:21:50 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-05-06 18:39:47 +0200 |
| commit | 74e1b3f855c7f0349577681601dd1eb11917dd06 (patch) | |
| tree | 2b0bab3dfdcbd66d3f4328cd6dea90ddc9978174 | |
| parent | 4c2a776959da0b7270c9d57289deed4a076c5d51 (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>
(cherry picked from commit bbb8617ece6d946957c2eb96287081029bce530f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133866
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -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 7f4ae8543764..e4606a9a900d 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -1098,8 +1098,10 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R do { aPass = RequestPasswordFromUser( aRMode, xTmpHandler ); - if (m_pStorageFile->getStorageVersion() == 0) + if (!aPass.isEmpty() && m_pStorageFile->getStorageVersion() == 0) + { aPass = ReencodeAsOldHash(aPass); + } bResult = ( !aPass.isEmpty() && aPass == m_aMasterPasswd ); aRMode = PasswordRequestMode_PASSWORD_REENTER; // further questions with error notification |