diff options
| author | Martin Storsjö <martin@martin.st> | 2022-05-26 00:31:05 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2022-05-28 01:15:34 +0300 |
| commit | 9fba0b8a8c754a012fc74c90ffb7c26a56be8ca0 (patch) | |
| tree | 8816e5975545b3d3a1d06985e71e5dbf969f6fb1 | |
| parent | 0ea61725b1bd35f47d0ebc49597e73e6798c553d (diff) | |
mfenc: Use dlopen instead of LoadLibrary for loading mfplat.dll
The dlopen wrapper contains code to make loading libraries safer,
to avoid loading a potentially malicious DLL with the same name.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/mfenc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index 17d0ec60bd..13ed7b3e11 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -29,6 +29,7 @@ #include "libavutil/time.h" #include "codec_internal.h" #include "internal.h" +#include "compat/w32dlfcn.h" typedef struct MFContext { AVClass *av_class; @@ -1131,7 +1132,7 @@ static int mf_init_encoder(AVCodecContext *avctx) #if !HAVE_UWP #define LOAD_MF_FUNCTION(context, func_name) \ - context->functions.func_name = (void *)GetProcAddress(context->library, #func_name); \ + context->functions.func_name = (void *)dlsym(context->library, #func_name); \ if (!context->functions.func_name) { \ av_log(context, AV_LOG_ERROR, "DLL mfplat.dll failed to find function "\ #func_name "\n"); \ @@ -1158,7 +1159,7 @@ static int mf_load_library(AVCodecContext *avctx) MFContext *c = avctx->priv_data; #if !HAVE_UWP - c->library = LoadLibraryA("mfplat.dll"); + c->library = dlopen("mfplat.dll", 0); if (!c->library) { av_log(c, AV_LOG_ERROR, "DLL mfplat.dll failed to open\n"); @@ -1191,7 +1192,7 @@ static int mf_close(AVCodecContext *avctx) if (c->library) ff_free_mf(&c->functions, &c->mft); - FreeLibrary(c->library); + dlclose(c->library); c->library = NULL; #else ff_free_mf(&c->functions, &c->mft); |