virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

cmdutils: fix codec-specific options from preset

Browse Source 
Using a preset file caused the address of a stack variable to be stored
in opt_names/values. This change causes the strings to be dup'd then
freed in uninit_opts.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 60ff9de6ff)
This commit is contained in:
James Zern 2011-02-04 18:29:46 -08:00 committed by Michael Niedermayer
parent ba3517aa6f
commit 3f171f5aec
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmdutils.c
View File

@ -78,6 +78,14 @@ void uninit_opts(void)
#if CONFIG_SWSCALE #if CONFIG_SWSCALE
av_freep(&sws_opts); av_freep(&sws_opts);
#endif #endif
for (i = 0; i < opt_name_count; i++) {
//opt_values are only stored for codec-specific options in which case
//both the name and value are dup'd
if (opt_values[i]) {
av_freep(&opt_names[i]);
av_freep(&opt_values[i]);
}
}
av_freep(&opt_names); av_freep(&opt_names);
av_freep(&opt_values); av_freep(&opt_values);
} }
@ -270,9 +278,9 @@ int opt_default(const char *opt, const char *arg){
//FIXME we should always use avcodec_opts, ... for storing options so there will not be any need to keep track of what i set over this //FIXME we should always use avcodec_opts, ... for storing options so there will not be any need to keep track of what i set over this
opt_values= av_realloc(opt_values, sizeof(void*)*(opt_name_count+1)); opt_values= av_realloc(opt_values, sizeof(void*)*(opt_name_count+1));
opt_values[opt_name_count]= o ? NULL : arg; opt_values[opt_name_count]= o ? NULL : av_strdup(arg);
opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1)); opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1));
opt_names[opt_name_count++]= o ? o->name : opt; opt_names[opt_name_count++]= o ? o->name : av_strdup(opt);
if ((*avcodec_opts && avcodec_opts[0]->debug) || (avformat_opts && avformat_opts->debug)) if ((*avcodec_opts && avcodec_opts[0]->debug) || (avformat_opts && avformat_opts->debug))
av_log_set_level(AV_LOG_DEBUG); av_log_set_level(AV_LOG_DEBUG);