starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-24 02:34:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Avoid calling SetDllDirectory when looking for dependent DLLs

Browse Source 
Using the full path and appropriate LoadLibraryEx flags is safer as it
gives us more control over the search paths.
This commit is contained in:
Richard Stanway
2026-06-05 15:27:30 -04:00
committed by Ryan Foster
parent 77eabcc06a
commit 8801dbef06
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/util/platform-windows.c
+10 -8
View File
@@ -83,19 +83,21 @@ void *os_dlopen(const char *path)
* dynamically loaded libraries on windows to search for dependent
* libraries that are within the library's own directory */
wpath_slash = wcsrchr(wpath, L'/');
if (wpath_slash) {
*wpath_slash = 0;
SetDllDirectoryW(wpath);
*wpath_slash = L'/';
wchar_t fullpath[MAX_PATH];
/* FIXME: this should use the OBS install dir as a base and not rely on the current directory */
if (GetFullPathNameW(wpath, MAX_PATH, fullpath, NULL)) {
h_library = LoadLibraryExW(fullpath, NULL,
LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
}
} else {
h_library = LoadLibraryExW(wpath, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
}
h_library = LoadLibraryW(wpath);
bfree(wpath);
if (wpath_slash)
SetDllDirectoryW(NULL);
if (!h_library) {
DWORD error = GetLastError();