diff options
| author | Niklas Haas <git@haasn.dev> | 2024-12-02 11:28:45 +0100 |
|---|---|---|
| committer | Niklas Haas <git@haasn.dev> | 2024-12-04 11:38:30 +0100 |
| commit | 79452d382f7b55f258c17f8ed8a51feb5411713a (patch) | |
| tree | 89f22b0e7689e01ade830768fbbc588cef485f9b | |
| parent | 40302cc35b631443f558cb3030f8de60accdf2f4 (diff) | |
| download | ffmpeg-79452d382f7b55f258c17f8ed8a51feb5411713a.tar.gz | |
swscale/graph: fix memleak of cascaded graphs
Just free them directly and discard the parent context.
Fixes: bf738412e849bcb8c63a330dfb814281b3d97f6b
Signed-off-by: Niklas Haas <git@haasn.dev>
Sponsored-by: Sovereign Tech Fund
| -rw-r--r-- | libswscale/graph.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libswscale/graph.c b/libswscale/graph.c index ee9d9847a9..fbad1fe8c3 100644 --- a/libswscale/graph.c +++ b/libswscale/graph.c @@ -292,7 +292,7 @@ static void legacy_chr_pos(SwsGraph *graph, int *chr_pos, int override, int *war *chr_pos = override; } -static int init_legacy_subpass(SwsGraph *graph, SwsContext *sws, int cascaded, +static int init_legacy_subpass(SwsGraph *graph, SwsContext *sws, SwsPass *input, SwsPass **output) { SwsInternal *c = sws_internal(sws); @@ -308,11 +308,14 @@ static int init_legacy_subpass(SwsGraph *graph, SwsContext *sws, int cascaded, for (int i = 0; i < num_cascaded; i++) { SwsContext *sub = c->cascaded_context[i]; const int is_last = i + 1 == num_cascaded; - ret = init_legacy_subpass(graph, sub, 1, input, is_last ? output : &input); + ret = init_legacy_subpass(graph, sub, input, is_last ? output : &input); if (ret < 0) return ret; + /* Steal cascaded context, so we can free the parent */ + c->cascaded_context[i] = NULL; } + sws_free_context(&sws); return 0; } @@ -336,8 +339,7 @@ static int init_legacy_subpass(SwsGraph *graph, SwsContext *sws, int cascaded, if (!pass) return AVERROR(ENOMEM); pass->setup = setup_legacy_swscale; - if (!cascaded) /* parent context frees this automatically */ - pass->free = free_legacy_swscale; + pass->free = free_legacy_swscale; /** * For slice threading, we need to create sub contexts, similar to how @@ -452,7 +454,7 @@ static int add_legacy_sws_pass(SwsGraph *graph, SwsFormat src, SwsFormat dst, brightness, contrast, saturation); } - ret = init_legacy_subpass(graph, sws, 0, input, output); + ret = init_legacy_subpass(graph, sws, input, output); if (ret < 0) { sws_free_context(&sws); return ret; |