virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

mfenc: Use dlopen instead of LoadLibrary for loading mfplat.dll

Browse Source 
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>
This commit is contained in:
Martin Storsjö
2022-05-26 00:31:05 +03:00
parent 0ea61725b1
commit 9fba0b8a8c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mfenc.c
View File

@@ -29,6 +29,7 @@
#include "libavutil/time.h" #include "libavutil/time.h"
#include "codec_internal.h" #include "codec_internal.h"
#include "internal.h" #include "internal.h"
#include "compat/w32dlfcn.h"
typedef struct MFContext { typedef struct MFContext {
AVClass *av_class; AVClass *av_class;
@@ -1131,7 +1132,7 @@ static int mf_init_encoder(AVCodecContext *avctx)
#if !HAVE_UWP #if !HAVE_UWP
#define LOAD_MF_FUNCTION(context, func_name) \ #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) { \ if (!context->functions.func_name) { \
av_log(context, AV_LOG_ERROR, "DLL mfplat.dll failed to find function "\ av_log(context, AV_LOG_ERROR, "DLL mfplat.dll failed to find function "\
#func_name "\n"); \ #func_name "\n"); \
@@ -1158,7 +1159,7 @@ static int mf_load_library(AVCodecContext *avctx)
MFContext *c = avctx->priv_data; MFContext *c = avctx->priv_data;
#if !HAVE_UWP #if !HAVE_UWP
c->library = LoadLibraryA("mfplat.dll"); c->library = dlopen("mfplat.dll", 0);
if (!c->library) { if (!c->library) {
av_log(c, AV_LOG_ERROR, "DLL mfplat.dll failed to open\n"); 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) if (c->library)
ff_free_mf(&c->functions, &c->mft); ff_free_mf(&c->functions, &c->mft);
FreeLibrary(c->library); dlclose(c->library);
c->library = NULL; c->library = NULL;
#else #else
ff_free_mf(&c->functions, &c->mft); ff_free_mf(&c->functions, &c->mft);