[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - desktop/source

[Mike Kaganski]

 desktop/source/app/cmdlineargs.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6ad30e75c0bc88755f4f6bf4b32adfa5faf3e1ec
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jul 19 12:36:19 2017 +0300

    CheckWebQuery: Don't use OUString::createFromAscii for user input
    
    Change-Id: I26803984c0a9e172aa4ceb7bfc9d26abb14ca207
    Reviewed-on: https://gerrit.libreoffice.org/40173
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 5734c6fee6a959b86b5e7f9c391ae3bee6009a08)
    Reviewed-on: https://gerrit.libreoffice.org/40175
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 2cdffc53a043..ad07af0f045a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -231,7 +231,7 @@ CommandLineEvent CheckWebQuery(/* in,out */ OUString& arg, CommandLineEvent curE
 
         stream.Close();
 
-        arg = OUString::createFromAscii(aResult.getStr());
+        arg = OStringToOUString(aResult.makeStringAndClear(), osl_getThreadTextEncoding());
         return CommandLineEvent::ForceNew;
     }
     catch (...)