ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sat Sep 24 15:03:42 2016 -0300| [449dc25f56fa1a84285e0f972849c4c40896807b] | committer: James Almer
ffmpeg: fix memleak of bitstream filter context on failure Increase the nb_bitstream_filters value as soon as the context is allocated, so if option parsing fails the last context is actually freed. Reviewed-by: Josh de Kock <j...@itanimul.li> Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=449dc25f56fa1a84285e0f972849c4c40896807b --- ffmpeg_opt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 38b6b67..73da546 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1349,14 +1349,16 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e exit_program(1); } + ost->nb_bitstream_filters++; + if (bsf_options_str && filter->priv_class) { - const AVOption *opt = av_opt_next(ost->bsf_ctx[ost->nb_bitstream_filters]->priv_data, NULL); + const AVOption *opt = av_opt_next(ost->bsf_ctx[ost->nb_bitstream_filters-1]->priv_data, NULL); const char * shorthand[2] = {NULL}; if (opt) shorthand[0] = opt->name; - ret = av_opt_set_from_string(ost->bsf_ctx[ost->nb_bitstream_filters]->priv_data, bsf_options_str, shorthand, "=", ":"); + ret = av_opt_set_from_string(ost->bsf_ctx[ost->nb_bitstream_filters-1]->priv_data, bsf_options_str, shorthand, "=", ":"); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Error parsing options for bitstream filter %s\n", bsf_name); exit_program(1); @@ -1364,8 +1366,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e } av_freep(&bsf); - ost->nb_bitstream_filters++; - if (*bsfs) bsfs++; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
