virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

fftools/resources/resman: Don't alloc ResourceManager, fix race

Browse Source 
The resman_ctx pointer was accessed outside of its guarding
mutex.

Also make the ResourceManager static.

Reviewed-by: softworkz . <softworkz-at-hotmail.com@ffmpeg.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-01 04:15:58 +02:00
parent b4c5397642
commit 06cd9086c3
1 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
fftools/resources/resman.c
View File

@ -60,7 +60,7 @@ typedef struct ResourceManagerContext {
static AVMutex mutex = AV_MUTEX_INITIALIZER; static AVMutex mutex = AV_MUTEX_INITIALIZER;
ResourceManagerContext *resman_ctx = NULL; static ResourceManagerContext resman_ctx = { .class = &resman_class };
#if CONFIG_RESOURCE_COMPRESSION #if CONFIG_RESOURCE_COMPRESSION
@ -117,39 +117,11 @@ static int decompress_gzip(ResourceManagerContext *ctx, uint8_t *in, unsigned in
} }
#endif #endif
static ResourceManagerContext *get_resman_context(void)
{
ResourceManagerContext *res = resman_ctx;
ff_mutex_lock(&mutex);
if (res)
goto end;
res = av_mallocz(sizeof(ResourceManagerContext));
if (!res) {
av_log(NULL, AV_LOG_ERROR, "Failed to allocate resource manager context\n");
goto end;
}
res->class = &resman_class;
resman_ctx = res;
end:
ff_mutex_unlock(&mutex);
return res;
}
void ff_resman_uninit(void) void ff_resman_uninit(void)
{ {
ff_mutex_lock(&mutex); ff_mutex_lock(&mutex);
if (resman_ctx) { av_dict_free(&resman_ctx.resource_dic);
if (resman_ctx->resource_dic)
av_dict_free(&resman_ctx->resource_dic);
av_freep(&resman_ctx);
}
ff_mutex_unlock(&mutex); ff_mutex_unlock(&mutex);
} }
@ -157,14 +129,11 @@ void ff_resman_uninit(void)
char *ff_resman_get_string(FFResourceId resource_id) char *ff_resman_get_string(FFResourceId resource_id)
{ {
ResourceManagerContext *ctx = get_resman_context(); ResourceManagerContext *ctx = &resman_ctx;
FFResourceDefinition resource_definition = { 0 }; FFResourceDefinition resource_definition = { 0 };
AVDictionaryEntry *dic_entry; AVDictionaryEntry *dic_entry;
char *res = NULL; char *res = NULL;
if (!ctx)
return NULL;
for (unsigned i = 0; i < FF_ARRAY_ELEMS(resource_definitions); ++i) { for (unsigned i = 0; i < FF_ARRAY_ELEMS(resource_definitions); ++i) {
FFResourceDefinition def = resource_definitions[i]; FFResourceDefinition def = resource_definitions[i];
if (def.resource_id == resource_id) { if (def.resource_id == resource_id) {