har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/af_amerge: Cleanup on av_channel_layout_copy() failure

Browse Source 
Fixes: CID1503088 Resource leak

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 62d4414d54f57612ac444643a92de7d10455b6c6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-06-10 15:18:07 +02:00
parent acd5523b7a
commit 9ca0577c5e
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/af_amerge.c
View File

@ -245,8 +245,11 @@ static int try_push_frame(AVFilterContext *ctx, int nb_samples)
av_make_q(1, outlink->sample_rate), av_make_q(1, outlink->sample_rate),
outlink->time_base); outlink->time_base);
if ((ret = av_channel_layout_copy(&outbuf->ch_layout, &outlink->ch_layout)) < 0) if ((ret = av_channel_layout_copy(&outbuf->ch_layout, &outlink->ch_layout)) < 0) {
free_frames(s->nb_inputs, inbuf);
av_frame_free(&outbuf);
return ret; return ret;
}
while (nb_samples) { while (nb_samples) {
/* Unroll the most common sample formats: speed +~350% for the loop, /* Unroll the most common sample formats: speed +~350% for the loop,