[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - shell/source

[Stephan Bergmann (via logerrit)]

 shell/source/win32/SysShExec.cxx |   31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

New commits:
commit e3d8bf61586786dcbf5ddb985367483971a0cc4b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Feb 16 09:30:09 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Thu Mar 25 10:24:54 2021 +0100

    Improve checkExtension
    
    Change-Id: Iff416a9c5930ad5903f7ee51a2abbc94d5f40800
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110970
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit f456c4dacf700e064e112ef068ff7edb04239754)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110922
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    (cherry picked from commit f19d95986756412e5d72047656eec17a720c5e57)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113049
    Tested-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index c4170d2f9de5..97a8df6e94b6 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -410,21 +410,28 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
                 }
             }
             pathname = o3tl::toU(path);
+            // ShellExecuteExW appears to ignore trailing dots, so remove them:
+            while (pathname.endsWith(".", &pathname)) {}
             auto const n = pathname.lastIndexOf('.');
             if (n > pathname.lastIndexOf('\\')) {
                 auto const ext = pathname.copy(n + 1);
-                OUString env;
-                if (osl_getEnvironment(OUString("PATHEXT").pData, &env.pData) != osl_Process_E_None)
-                {
-                    SAL_INFO("shell", "osl_getEnvironment(PATHEXT) failed");
-                }
-                if (!(checkExtension(ext, env)
-                      && checkExtension(
-                          ext,
-                          ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.CLASS;.JAR")))
-                {
-                    throw css::lang::IllegalArgumentException(
-                        "XSystemShellExecute.execute, cannot process <" + aCommand + ">", {}, 0);
+                if (!ext.isEmpty()) {
+                    OUString env;
+                    if (osl_getEnvironment(OUString("PATHEXT").pData, &env.pData)
+                        != osl_Process_E_None)
+                    {
+                        SAL_INFO("shell", "osl_getEnvironment(PATHEXT) failed");
+                    }
+                    if (!(checkExtension(ext, env)
+                          && checkExtension(
+                              ext,
+                              ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.CLASS;"
+                                  ".JAR;.APPLICATION;.LNK;.SCR")))
+                    {
+                        throw css::lang::IllegalArgumentException(
+                            "XSystemShellExecute.execute, cannot process <" + aCommand + ">", {},
+                            0);
+                    }
                 }
             }
         }