Message ID | 20200823095039.18851-2-andreas.rheinhardt@gmail.com |
---|---|
State | Accepted |
Commit | 426c16d61a9b5056a157a1a2a057a4e4d13eef84 |
Headers | show |
Series | [FFmpeg-devel,1/3] avfilter/graphparser: Fix leaks when parsing inputs fails | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
Andreas Rheinhardt (12020-08-23): > The AVFilterInOuts normally get freed in init_output_filter() when > the corresponding streams get created; yet if an error happens before > one reaches said point, they leak. Therefore this commit makes > ffmpeg_cleanup free them, too. > > Fixes ticket #8267. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > fftools/ffmpeg.c | 1 + > 1 file changed, 1 insertion(+) LGTM. Regards,
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 173ac3c9a0..84306818a2 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -528,6 +528,7 @@ static void ffmpeg_cleanup(int ret) for (j = 0; j < fg->nb_outputs; j++) { OutputFilter *ofilter = fg->outputs[j]; + avfilter_inout_free(&ofilter->out_tmp); av_freep(&ofilter->name); av_freep(&ofilter->formats); av_freep(&ofilter->channel_layouts);
The AVFilterInOuts normally get freed in init_output_filter() when the corresponding streams get created; yet if an error happens before one reaches said point, they leak. Therefore this commit makes ffmpeg_cleanup free them, too. Fixes ticket #8267. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- fftools/ffmpeg.c | 1 + 1 file changed, 1 insertion(+)