[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sdext/source

[Libreoffice Gerrit user]

 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6ec29250c259b80c551f10cfe0c5d416283c0230
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 8 10:58:00 2018 +0000
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Dec 12 16:50:56 2018 +0100

    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 at cib.de>

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");