virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avformat/mpeg: fix memleak of sub_name on error

Browse Source 
Fixes CID1254666

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-16 19:17:34 +01:00
parent 62eca2f827
commit 51ddaf6549
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mpeg.c
View File

@ -697,12 +697,16 @@ static int vobsub_read_header(AVFormatContext *s)
memcpy(ext, !strncmp(ext, "IDX", 3) ? "SUB" : "sub", 3);
av_log(s, AV_LOG_VERBOSE, "IDX/SUB: %s -> %s\n", s->filename, sub_name);
if (!(iformat = av_find_input_format("mpeg")))
return AVERROR_DEMUXER_NOT_FOUND;
if (!(iformat = av_find_input_format("mpeg"))) {
ret = AVERROR_DEMUXER_NOT_FOUND;
goto end;
}
vobsub->sub_ctx = avformat_alloc_context();
if (!vobsub->sub_ctx)
return AVERROR(ENOMEM);
if (!vobsub->sub_ctx) {
ret = AVERROR(ENOMEM);
goto end;
}
if ((ret = ff_copy_whitelists(vobsub->sub_ctx, s)) < 0)
goto end;