mirror of https://git.ffmpeg.org/ffmpeg.git
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 <josh@itanimul.li> Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
3ac76d7618
commit
449dc25f56
|
@ -1349,14 +1349,16 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
|
||||||
exit_program(1);
|
exit_program(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ost->nb_bitstream_filters++;
|
||||||
|
|
||||||
if (bsf_options_str && filter->priv_class) {
|
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};
|
const char * shorthand[2] = {NULL};
|
||||||
|
|
||||||
if (opt)
|
if (opt)
|
||||||
shorthand[0] = opt->name;
|
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) {
|
if (ret < 0) {
|
||||||
av_log(NULL, AV_LOG_ERROR, "Error parsing options for bitstream filter %s\n", bsf_name);
|
av_log(NULL, AV_LOG_ERROR, "Error parsing options for bitstream filter %s\n", bsf_name);
|
||||||
exit_program(1);
|
exit_program(1);
|
||||||
|
@ -1364,8 +1366,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
|
||||||
}
|
}
|
||||||
av_freep(&bsf);
|
av_freep(&bsf);
|
||||||
|
|
||||||
ost->nb_bitstream_filters++;
|
|
||||||
|
|
||||||
if (*bsfs)
|
if (*bsfs)
|
||||||
bsfs++;
|
bsfs++;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue