virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

asfdec: close the demuxer properly when read_header is failing

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Alexandra Hájková 2015-07-17 14:17:02 +02:00 committed by Anton Khirnov
parent 5655236a67
commit 93f16f338f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/asfdec.c
View File

@ -1659,14 +1659,14 @@ static int asf_read_header(AVFormatContext *s)
if (ret == AVERROR_EOF && asf->data_reached) if (ret == AVERROR_EOF && asf->data_reached)
break; break;
else else
return ret; goto failed;
} }
g = find_guid(guid); g = find_guid(guid);
if (g) { if (g) {
asf->unknown_offset = asf->offset; asf->unknown_offset = asf->offset;
asf->is_header = 1; asf->is_header = 1;
if ((ret = g->read_object(s, g)) < 0) if ((ret = g->read_object(s, g)) < 0)
return ret; goto failed;
} else { } else {
size = avio_rl64(pb); size = avio_rl64(pb);
align_position(pb, asf->offset, size); align_position(pb, asf->offset, size);
@ -1677,7 +1677,8 @@ static int asf_read_header(AVFormatContext *s)
if (!asf->data_reached) { if (!asf->data_reached) {
av_log(s, AV_LOG_ERROR, "Data Object was not found.\n"); av_log(s, AV_LOG_ERROR, "Data Object was not found.\n");
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto failed;
} }
if (pb->seekable) if (pb->seekable)
avio_seek(pb, asf->first_packet_offset, SEEK_SET); avio_seek(pb, asf->first_packet_offset, SEEK_SET);
@ -1702,6 +1703,10 @@ static int asf_read_header(AVFormatContext *s)
} }
return 0; return 0;
failed:
asf_read_close(s);
return ret;
} }
AVInputFormat ff_asf_demuxer = { AVInputFormat ff_asf_demuxer = {