diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 19:23:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 19:23:23 +0200 |
| commit | 4641ae352ec587355764ffd5c43dd0d0ebd47654 (patch) | |
| tree | da175629ebf72bf55a504dd2d0240b1034892f4e /libavformat/concatdec.c | |
| parent | e56425d1a71828c32f7f355f0979534e1007078f (diff) | |
avformat: Add and use ff_copy_whitelists()
Fixes potential security issue in case of running out of memory
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/concatdec.c')
| -rw-r--r-- | libavformat/concatdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index ed959cf219..2089883307 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -289,9 +289,8 @@ static int open_file(AVFormatContext *avf, unsigned fileno) cat->avf->interrupt_callback = avf->interrupt_callback; - av_assert0(!cat->avf->codec_whitelist && !cat->avf->format_whitelist); - cat->avf-> codec_whitelist = av_strdup(avf->codec_whitelist); - cat->avf->format_whitelist = av_strdup(avf->format_whitelist); + if ((ret = ff_copy_whitelists(cat->avf, avf)) < 0) + return ret; if ((ret = avformat_open_input(&cat->avf, file->url, NULL, NULL)) < 0 || (ret = avformat_find_stream_info(cat->avf, NULL)) < 0) { |