diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-08 10:58:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-08 15:09:59 +0100 |
| commit | e3ca8385fed93e61efb8200149e06b822a84a47e (patch) | |
| tree | 08eac13f0161765f66d9f91fecc092ce543ad5d1 /sdext/source | |
| parent | c3aef7a8e389942183e90683923717724bf65f42 (diff) | |
Resolves: rhbz#1647507 try inputted password as both user and owner password
Change-Id: Ibe1fae39d3153238e85400c9645766c260c9290d
Reviewed-on: https://gerrit.libreoffice.org/63080
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sdext/source')
| -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 28334dac56d8..0f4a35b77ac5 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"); |