diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2013-03-20 13:18:12 +0400 |
---|---|---|
committer | Nicolas George <nicolas.george@normalesup.org> | 2013-03-20 16:35:24 +0400 |
commit | de1568a452d8348917fee533fe17517131dccf95 (patch) | |
tree | a42806cb4ab95682827e24c89a6b7ad8755a46b7 /libavformat/concatdec.c | |
parent | 5eb273b2e767c86f78cc0e7e1a31bda4fedd2f56 (diff) |
lavf/concatdec: fix possible leak in case of malloc failure.
Fix CID 747737.
Diffstat (limited to 'libavformat/concatdec.c')
-rw-r--r-- | libavformat/concatdec.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index a9fcc76a03..380ad4383f 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -82,25 +82,26 @@ static int add_file(AVFormatContext *avf, char *filename, ConcatFile **rfile, { ConcatContext *cat = avf->priv_data; ConcatFile *file; - char *url; + char *url = NULL; size_t url_len; + int ret; if (cat->safe > 0 && !safe_filename(filename)) { av_log(avf, AV_LOG_ERROR, "Unsafe file name '%s'\n", filename); - return AVERROR(EPERM); + FAIL(AVERROR(EPERM)); } url_len = strlen(avf->filename) + strlen(filename) + 16; if (!(url = av_malloc(url_len))) - return AVERROR(ENOMEM); + FAIL(AVERROR(ENOMEM)); ff_make_absolute_url(url, url_len, avf->filename, filename); - av_free(filename); + av_freep(&filename); if (cat->nb_files >= *nb_files_alloc) { size_t n = FFMAX(*nb_files_alloc * 2, 16); ConcatFile *new_files; if (n <= cat->nb_files || n > SIZE_MAX / sizeof(*cat->files) || !(new_files = av_realloc(cat->files, n * sizeof(*cat->files)))) - return AVERROR(ENOMEM); + FAIL(AVERROR(ENOMEM)); cat->files = new_files; *nb_files_alloc = n; } @@ -114,6 +115,11 @@ static int add_file(AVFormatContext *avf, char *filename, ConcatFile **rfile, file->duration = AV_NOPTS_VALUE; return 0; + +fail: + av_free(url); + av_free(filename); + return ret; } static int open_file(AVFormatContext *avf, unsigned fileno) |