From 4641ae352ec587355764ffd5c43dd0d0ebd47654 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 24 Oct 2014 19:23:23 +0200 Subject: 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 --- libavformat/concatdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libavformat/concatdec.c') 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) { -- cgit v1.2.3