diff options
author | James Ross-Gowan <rossymiles@gmail.com> | 2014-01-07 23:26:26 +1100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-01-27 10:04:29 +0100 |
commit | d26ee98fa61872164aacd647ae8416626e802984 (patch) | |
tree | d84f1d48036cbc6147ffaf7e93a4d415e32ff675 /audio/out/ao_wasapi.c | |
parent | 4c83a93617528072fbdda9fc7e6159bc8a5769fc (diff) | |
download | mpv-d26ee98fa61872164aacd647ae8416626e802984.tar.bz2 mpv-d26ee98fa61872164aacd647ae8416626e802984.tar.xz |
w32: use safe DLL search paths everywhere
Windows applications that use LoadLibrary are vulnerable to DLL
preloading attacks if a malicious DLL with the same name as a system DLL
is placed in the current directory. mpv had some code to avoid this in
ao_wasapi.c. This commit just moves it to main.c, since there's no
reason it can't be used process-wide.
This change can affect how plugins are loaded in AviSynth, but it
shouldn't be a problem since MPC-HC also does this and it's a very
popular AviSynth client.
Diffstat (limited to 'audio/out/ao_wasapi.c')
-rw-r--r-- | audio/out/ao_wasapi.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 3d0d1ddf3d..7729eb2bda 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -36,10 +36,6 @@ #include "misc/ring.h" #include "ao.h" -#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE -#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE 0x00000001 -#endif - #ifndef PKEY_Device_FriendlyName DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, @@ -136,17 +132,6 @@ static int fill_VistaBlob(wasapi_state *state) { if (!state) return 1; - HMODULE hkernel32 = GetModuleHandleW(L"kernel32.dll"); - if (!hkernel32) - return 1; - WINBOOL (WINAPI *pSetDllDirectory)(LPCWSTR lpPathName) = - (WINBOOL (WINAPI *)(LPCWSTR))GetProcAddress(hkernel32, "SetDllDirectoryW"); - WINBOOL (WINAPI *pSetSearchPathMode)(DWORD Flags) = - (WINBOOL (WINAPI *)(DWORD))GetProcAddress(hkernel32, "SetSearchPathMode"); - if (pSetSearchPathMode) - pSetDllDirectory(L""); /* Attempt to use safe search paths */ - if (pSetSearchPathMode) - pSetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE); state->VistaBlob.hAvrt = LoadLibraryW(L"avrt.dll"); if (!state->VistaBlob.hAvrt) goto exit_label; @@ -160,8 +145,6 @@ static int fill_VistaBlob(wasapi_state *state) exit_label: if (state->VistaBlob.hAvrt) FreeLibrary(state->VistaBlob.hAvrt); - if (pSetSearchPathMode) - pSetDllDirectory(NULL); return 1; } |