[Libreoffice-commits] core.git: pyuno/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Mon Jan 4 17:26:23 UTC 2021


 pyuno/source/loader/pyuno_loader.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff3ce4f389083fba206e752e09f6b60ca003f625
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jan 4 10:59:58 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Jan 4 18:25:41 2021 +0100

    mbstowcs failure check is only relevant for non-_WIN32 now
    
    ...after cbe9a0a815e4a73bf8db425a7c5c651e67b2ed65 "Use Unicode paths on Windows
    for pyuno"
    
    Change-Id: I898ee8ebbc1dfb215c55940c6336756ae7b5ccc5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108658
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 1337ea8c78f9..3a7bfd5cf45f 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -119,12 +119,12 @@ static void setPythonHome ( const OUString & pythonHome )
 #else
     OString o = OUStringToOString(systemPythonHome, osl_getThreadTextEncoding());
     size_t len = mbstowcs(wide, o.pData->buffer, PATH_MAX + 1);
-#endif
     if(len == size_t(-1))
     {
         PyErr_SetString(PyExc_SystemError, "invalid multibyte sequence in python home path");
         return;
     }
+#endif
     if(len >= PATH_MAX + 1)
     {
         PyErr_SetString(PyExc_SystemError, "python home path is too long");


More information about the Libreoffice-commits mailing list