e7d2edb025
LO on Windows defaults to Vulkan, and Skia tries to load the vulkan DLL, which may not be present on some systems. The library AFAICT should always be in a system directory, so restrict library searching to just there to avoid the possibility of DLL hijacking, just to be safe. Change-Id: I78ad3c7297e613c0316e82c5ff3c0110a02da337 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121437 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
13 lines
490 B
Groff
13 lines
490 B
Groff
diff --git a/src/ports/SkOSLibrary_win.cpp b/src/ports/SkOSLibrary_win.cpp
|
|
index d2dcbe0af6..c288bbf177 100644
|
|
--- a/src/ports/SkOSLibrary_win.cpp
|
|
+++ b/src/ports/SkOSLibrary_win.cpp
|
|
@@ -11,7 +11,7 @@
|
|
#include "src/ports/SkOSLibrary.h"
|
|
|
|
void* SkLoadDynamicLibrary(const char* libraryName) {
|
|
- return LoadLibraryA(libraryName);
|
|
+ return LoadLibraryExA(libraryName, nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
|
|
}
|
|
|
|
void* SkGetProcedureAddress(void* library, const char* functionName) {
|