[FFmpeg-devel] [PATCH] lavf/concatdec: fix possible leak in case of malloc failure.
Nicolas George
nicolas.george at normalesup.org
Wed Mar 20 10:30:52 CET 2013
Fix CID 747737.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
libavformat/concatdec.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index a9fcc76..380ad43 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)
--
1.7.10.4
More information about the ffmpeg-devel
mailing list