RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/concatdec: fix possible leak in case of malloc failure. 

Fix CID 747737.
This commit is contained in:
Nicolas George 2013-03-20 10:18:12 +01:00
parent 5eb273b2e7
commit de1568a452
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/concatdec.c
View File

@ -82,25 +82,26 @@ static int add_file(AVFormatContext *avf, char *filename, ConcatFile **rfile,
{ {
ConcatContext *cat = avf->priv_data; ConcatContext *cat = avf->priv_data;
ConcatFile *file; ConcatFile *file;
char *url; char *url = NULL;
size_t url_len; size_t url_len;
int ret;
if (cat->safe > 0 && !safe_filename(filename)) { if (cat->safe > 0 && !safe_filename(filename)) {
av_log(avf, AV_LOG_ERROR, "Unsafe file name '%s'\n", 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; url_len = strlen(avf->filename) + strlen(filename) + 16;
if (!(url = av_malloc(url_len))) if (!(url = av_malloc(url_len)))
return AVERROR(ENOMEM); FAIL(AVERROR(ENOMEM));
ff_make_absolute_url(url, url_len, avf->filename, filename); ff_make_absolute_url(url, url_len, avf->filename, filename);
av_free(filename); av_freep(&filename);
if (cat->nb_files >= *nb_files_alloc) { if (cat->nb_files >= *nb_files_alloc) {
size_t n = FFMAX(*nb_files_alloc * 2, 16); size_t n = FFMAX(*nb_files_alloc * 2, 16);
ConcatFile *new_files; ConcatFile *new_files;
if (n <= cat->nb_files || n > SIZE_MAX / sizeof(*cat->files) || if (n <= cat->nb_files || n > SIZE_MAX / sizeof(*cat->files) ||
!(new_files = av_realloc(cat->files, n * sizeof(*cat->files)))) !(new_files = av_realloc(cat->files, n * sizeof(*cat->files))))
return AVERROR(ENOMEM); FAIL(AVERROR(ENOMEM));
cat->files = new_files; cat->files = new_files;
*nb_files_alloc = n; *nb_files_alloc = n;
} }
@ -114,6 +115,11 @@ static int add_file(AVFormatContext *avf, char *filename, ConcatFile **rfile,
file->duration = AV_NOPTS_VALUE; file->duration = AV_NOPTS_VALUE;
return 0; return 0;
fail:
av_free(url);
av_free(filename);
return ret;
} }
static int open_file(AVFormatContext *avf, unsigned fileno) static int open_file(AVFormatContext *avf, unsigned fileno)