sal/osl/w32/process.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
New commits: commit 994a0b60713f730d703673ca311c2c6adc62d4ce Author: Mike Kaganski <[email protected]> AuthorDate: Tue Apr 16 22:08:42 2019 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Mar 2 16:03:17 2020 +0100 tdf#124776: don't use SearchPathW to get full path of executable ... use GetModuleFileNameW() for that. We call SetDllDirectoryW and SetSearchPathMode to improve security of the process, and exclude some paths (including current directory) from search when using API that looks for binaries whose names are not fully qualified. So the sequence is this: 1. Program is started using relative executable path like "instdir\program\soffice"; 2. sal_detail_initialize is called, which calls the two mentioned hardening functions; 3. sal_detail_initialize calls osl_setCommandArgs, which in turn calls osl_createCommandArgs_Impl; 4. The latter uses SearchPathW with empty path and first program arg "instdir\program\soffice" to find fully qualified program path. That now naturally fails, because current path is not searched. But to find the process name, we need no search: we can simply use GetModuleFileNameW() with NULL passed as module handle. Let's use that. Note that we can't use _wpgmptr/_get_wpgmptr, because we don't use wide entry point like wmain. LHM-Stuff --------- Dieser Patch löst das Problem wenn Symbols eingeschaltet ist, danach konnte LO nicht mit scalc.exe, swriter.exe, .. gestartet werden den es ist damit abgestürzt. (Dumpfile war im LO-Verzeichnis) Reviewed-on: https://gerrit.libreoffice.org/70844 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Mike Kaganski <[email protected]> (cherry picked from commit c650217cc543080928a26de4bfc07ebb0be5c6ca) Change-Id: I7a0013a0505f7bdd38164b09b045bfade9686664 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89689 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index 153df540c5ae..60fc80a23070 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -334,10 +334,8 @@ static rtl_uString ** osl_createCommandArgs_Impl (int argc, char **) { /* Ensure absolute path */ ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH ); - DWORD dwResult = 0; - - dwResult = SearchPathW ( - nullptr, o3tl::toW(ppArgs[0]->buffer), L".exe", aBuffer.getBufSizeInSymbols(), o3tl::toW(aBuffer), nullptr); + DWORD dwResult + = GetModuleFileNameW(nullptr, o3tl::toW(aBuffer), aBuffer.getBufSizeInSymbols()); if ((0 < dwResult) && (dwResult < aBuffer.getBufSizeInSymbols())) { /* Replace argv[0] with its absolute path */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
