diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-08 10:58:00 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-01-17 13:50:59 +0100 |
| commit | 3f9049a2363fd870c81c0fb63393994f3bfecba8 (patch) | |
| tree | 7fb49243ce8ded698c33abe3ec67f266aa8af291 /sdext | |
| parent | 9ae27d62bdd2b0fe8bf3cefd319aaacae3dd6616 (diff) | |
Resolves: rhbz#1647507 try inputted password as both user and owner password
Change-Id: Ibe1fae39d3153238e85400c9645766c260c9290d
Reviewed-on: https://gerrit.libreoffice.org/63081
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 6ec29250c259b80c551f10cfe0c5d416283c0230)
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx index 16db05afe870..b536a710e832 100644 --- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx @@ -101,9 +101,11 @@ int main(int argc, char **argv) : (ownerPassword[0] != '\001' ? new GooString(ownerPassword) : nullptr ) ); - GooString* pUserPasswordStr( userPassword[0] != '\001' + GooString* pUserPasswordStr( aPwBuf[0] != 0 + ? new GooString( aPwBuf ) + : (userPassword[0] != '\001' ? new GooString(userPassword) - : nullptr ); + : nullptr ) ); if( outputFile[0] != '\001' ) g_binary_out = fopen(outputFile,"wb"); |